Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 6cafb12dc85a5bdc722791cc5070968413264909

Authored by Mark McLoughlin
Committed by Jens Axboe
1 parent d995053d04
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

block: silently error unsupported empty barriers too 

With 2.6.32-rc5 in a KVM guest using dm and virtio_blk, we see the
following errors:

  end_request: I/O error, dev vda, sector 0
  end_request: I/O error, dev vda, sector 0

The errors go away if dm stops submitting empty barriers, by reverting:

  commit 52b1fd5a27c625c78373e024bf570af3c9d44a79
  Author: Mikulas Patocka <mpatocka@redhat.com>
    dm: send empty barriers to targets in dm_flush

We should silently error all barriers, even empty barriers, on devices
like virtio_blk which don't support them.

See also:

  https://bugzilla.redhat.com/514901

Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Acked-by: Alasdair G Kergon <agk@redhat.com>
Acked-by: Mikulas Patocka <mpatocka@redhat.com>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Neil Brown <neilb@suse.de>
Cc: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

... ... @@ -1161,7 +1161,7 @@
1161 1161 const unsigned int ff = bio->bi_rw & REQ_FAILFAST_MASK;
1162 1162 int rw_flags;
1163 1163  
1164   - if (bio_rw_flagged(bio, BIO_RW_BARRIER) && bio_has_data(bio) &&
  1164 + if (bio_rw_flagged(bio, BIO_RW_BARRIER) &&
1165 1165 (q->next_ordered == QUEUE_ORDERED_NONE)) {
1166 1166 bio_endio(bio, -EOPNOTSUPP);
1167 1167 return 0;