diff options
| author | NeilBrown <neilb@suse.de> | 2009-06-30 09:35:44 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-07-19 20:38:52 -0700 |
| commit | 6891897d22e3df3417f451f5fb921cb9562539e7 (patch) | |
| tree | ff1bf9032a4e0bac857bf5597f7246692f8b0af3 | |
| parent | 1d13d53f580ce84783fc7de8a25a978b47c53757 (diff) | |
blocK: Restore barrier support for md and probably other virtual devices.
commit db64f680ba4b5c56c4be59f0698000df89ff0281 upstream.
The next_ordered flag is only meaningful for devices that use __make_request.
So move the test against next_ordered out of generic code and in to
__make_request
Since this test was added, barriers have not worked on md or any
devices that don't use __make_request and so don't bother to set
next_ordered. (dm explicitly sets something other than
QUEUE_ORDERED_NONE since
commit 99360b4c18f7675b50d283301d46d755affe75fd
but notes in the comments that it is otherwise meaningless).
Cc: Ken Milmore <ken.milmore@googlemail.com>
Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | block/blk-core.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index c89883be8737..a59f1808900f 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -1158,6 +1158,11 @@ static int __make_request(struct request_queue *q, struct bio *bio) nr_sectors = bio_sectors(bio); + if (bio_barrier(bio) && bio_has_data(bio) && + (q->next_ordered == QUEUE_ORDERED_NONE)) { + bio_endio(bio, -EOPNOTSUPP); + return 0; + } /* * low level driver can indicate that it wants pages above a * certain limit bounced to low memory (ie for highmem, or even @@ -1461,11 +1466,6 @@ static inline void __generic_make_request(struct bio *bio) err = -EOPNOTSUPP; goto end_io; } - if (bio_barrier(bio) && bio_has_data(bio) && - (q->next_ordered == QUEUE_ORDERED_NONE)) { - err = -EOPNOTSUPP; - goto end_io; - } ret = q->make_request_fn(q, bio); } while (ret); |