diff options
| author | Jens Axboe <axboe@fb.com> | 2016-04-13 21:33:19 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2016-04-13 21:33:19 +0200 |
| commit | c888a8f95ae5b1067855235b3b71c1ebccf504f5 (patch) | |
| tree | b40d388cf1b30d5ac95a7472e4ca433d3ca18c6d /block/blk-core.c | |
| parent | nvme: Avoid reset work on watchdog timer function during error recovery (diff) | |
| download | linux-c888a8f95ae5b1067855235b3b71c1ebccf504f5.tar.xz linux-c888a8f95ae5b1067855235b3b71c1ebccf504f5.zip | |
block: kill off q->flush_flags
Now that we converted everything to the newer block write cache
interface, kill off the queue flush_flags and queueable flush
entries.
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block/blk-core.c')
| -rw-r--r-- | block/blk-core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index c50227796a26..2475b1c72773 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -1964,7 +1964,8 @@ generic_make_request_checks(struct bio *bio) * drivers without flush support don't have to worry * about them. */ - if ((bio->bi_rw & (REQ_FLUSH | REQ_FUA)) && !q->flush_flags) { + if ((bio->bi_rw & (REQ_FLUSH | REQ_FUA)) && + !test_bit(QUEUE_FLAG_WC, &q->queue_flags)) { bio->bi_rw &= ~(REQ_FLUSH | REQ_FUA); if (!nr_sectors) { err = 0; |