Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3a8ab7d authored by Jens Axboe's avatar Jens Axboe
Browse files

block: cleanup remaining manual checks for PREFLUSH|FUA 



Use op_is_flush() where applicable.

Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent bd6737f1

block/blk-core.c

+1 −1
Original line number Diff line number Diff line
@@ -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) {

block/blk-mq-sched.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	}