block: add a op_is_flush helper

This centralizes the checks for bios that needs to be go into the flush
state machine.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: Bart Van Assche <bart.vanassche@sandisk.com>
Signed-off-by: Jens Axboe <axboe@fb.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/block/blk-mq.c b/block/blk-mq.c
index 301ae29fd229..da2123dd681e 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -1406,7 +1406,7 @@ insert:
 static blk_qc_t blk_mq_make_request(struct request_queue *q, struct bio *bio)
 {
         const int is_sync = op_is_sync(bio->bi_opf);
-        const int is_flush_fua = bio->bi_opf & (REQ_PREFLUSH | REQ_FUA);
+        const int is_flush_fua = op_is_flush(bio->bi_opf);
         struct blk_mq_alloc_data data = { .flags = 0 };
         struct request *rq;
         unsigned int request_count = 0, srcu_idx;
@@ -1527,7 +1527,7 @@ done:
 static blk_qc_t blk_sq_make_request(struct request_queue *q, struct bio *bio)
 {
         const int is_sync = op_is_sync(bio->bi_opf);
-        const int is_flush_fua = bio->bi_opf & (REQ_PREFLUSH | REQ_FUA);
+        const int is_flush_fua = op_is_flush(bio->bi_opf);
         struct blk_plug *plug;
         unsigned int request_count = 0;
         struct blk_mq_alloc_data data = { .flags = 0 };