diff options
author | Jens Axboe <axboe@fb.com> | 2017-01-27 09:08:23 -0700 |
---|---|---|
committer | Jens Axboe <axboe@fb.com> | 2017-01-27 09:08:23 -0700 |
commit | f3a8ab7d55bc49b44baa229723e0b5b6ebacac4a (patch) | |
tree | f6432e779a0d4d5162e96662d384768706698284 /block/blk-core.c | |
parent | bd6737f1ae92e2f1c6e8362efe96dbe7f18fa07d (diff) | |
download | linux-stable-f3a8ab7d55bc49b44baa229723e0b5b6ebacac4a.tar.gz linux-stable-f3a8ab7d55bc49b44baa229723e0b5b6ebacac4a.tar.bz2 linux-stable-f3a8ab7d55bc49b44baa229723e0b5b6ebacac4a.zip |
block: cleanup remaining manual checks for PREFLUSH|FUA
Use op_is_flush() where applicable.
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block/blk-core.c')
-rw-r--r-- | block/blk-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index 4bfd8674afd0..02833ce5664e 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -1880,7 +1880,7 @@ generic_make_request_checks(struct bio *bio) * drivers without flush support don't have to worry * about them. */ - if ((bio->bi_opf & (REQ_PREFLUSH | REQ_FUA)) && + if (op_is_flush(bio->bi_opf) && !test_bit(QUEUE_FLAG_WC, &q->queue_flags)) { bio->bi_opf &= ~(REQ_PREFLUSH | REQ_FUA); if (!nr_sectors) { |