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 | |
| parent | bd6737f1ae92e2f1c6e8362efe96dbe7f18fa07d (diff) | |
| download | linux-0-day-f3a8ab7d55bc49b44baa229723e0b5b6ebacac4a.tar.gz linux-0-day-f3a8ab7d55bc49b44baa229723e0b5b6ebacac4a.tar.xz | |
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')
| -rw-r--r-- | block/blk-core.c | 2 | ||||
| -rw-r--r-- | block/blk-mq-sched.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index 4bfd8674afd03..02833ce5664ea 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) { diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c index 1112752f888d0..114814ec3d49f 100644 --- a/block/blk-mq-sched.c +++ b/block/blk-mq-sched.c @@ -358,7 +358,7 @@ void blk_mq_sched_insert_request(struct request *rq, bool at_head, struct blk_mq_ctx *ctx = rq->mq_ctx; struct blk_mq_hw_ctx *hctx = blk_mq_map_queue(q, ctx->cpu); - if (rq->tag == -1 && (rq->cmd_flags & (REQ_PREFLUSH | REQ_FUA))) { + if (rq->tag == -1 && op_is_flush(rq->cmd_flags)) { blk_mq_sched_insert_flush(hctx, rq, can_block); return; } |