diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2007-11-02 08:49:08 +0100 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2007-11-02 08:49:08 +0100 |
| commit | 51fd77bd9f512ab6cc9df0733ba1caaab89eb957 (patch) | |
| tree | fcc46ec04cad61a724eebffeabbecea197abbd89 /block | |
| parent | 5ec140e600b7d6624c657f008833f0e71bd5ef48 (diff) | |
| download | linux-51fd77bd9f512ab6cc9df0733ba1caaab89eb957.tar.gz linux-51fd77bd9f512ab6cc9df0733ba1caaab89eb957.tar.bz2 linux-51fd77bd9f512ab6cc9df0733ba1caaab89eb957.zip | |
[BLOCK] Don't allow empty barriers to be passed down to queues that don't grok them
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/ll_rw_blk.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c index 56f2646612e6..3e4e8bfbe856 100644 --- a/block/ll_rw_blk.c +++ b/block/ll_rw_blk.c @@ -3221,6 +3221,7 @@ static inline void __generic_make_request(struct bio *bio) sector_t old_sector; int ret, nr_sectors = bio_sectors(bio); dev_t old_dev; + int err = -EIO; might_sleep(); @@ -3248,7 +3249,7 @@ static inline void __generic_make_request(struct bio *bio) bdevname(bio->bi_bdev, b), (long long) bio->bi_sector); end_io: - bio_endio(bio, -EIO); + bio_endio(bio, err); break; } @@ -3283,6 +3284,10 @@ end_io: if (bio_check_eod(bio, nr_sectors)) goto end_io; + if (bio_empty_barrier(bio) && !q->prepare_flush_fn) { + err = -EOPNOTSUPP; + goto end_io; + } ret = q->make_request_fn(q, bio); } while (ret); |