block: cleanup remaining manual checks for PREFLUSH|FUA

[mirror_ubuntu-bionic-kernel.git] / block / blk-core.c

diff --git a/block/blk-core.c b/block/blk-core.c
index 4bfd8674afd03124c68cd435356331a5b707a1d7..02833ce5664ea4e59209a93ad82ff0d1f62e8f74 100644 (file)
--- 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) {