Commit c3a148d2 authored Jun 20, 2017 by Bart Van Assche Committed by Jens Axboe Jun 20, 2017

blk-mq: Initialize .rq_flags in blk_mq_rq_ctx_init()



Initialization of blk-mq requests is a bit weird: blk_mq_rq_ctx_init()
is called after a value has been assigned to .rq_flags and .rq_flags
is initialized in __blk_mq_finish_request(). Initialize .rq_flags in
blk_mq_rq_ctx_init() instead of relying on __blk_mq_finish_request().
Moving the initialization of .rq_flags is fine because all changes
and tests of .rq_flags occur between blk_get_request() and finishing
a request.

Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Hannes Reinecke <hare@suse.com>
Cc: Omar Sandoval <osandov@fb.com>
Cc: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

parent c8d9cf22

block/blk-mq.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -228,6 +228,8 @@ static struct request blk_mq_rq_ctx_init(struct blk_mq_alloc_data data,
		struct blk_mq_tags *tags = blk_mq_tags_from_data(data);
		struct request *rq = tags->static_rqs[tag];

		rq->rq_flags = 0;

		if (data->flags & BLK_MQ_REQ_INTERNAL) {
		rq->tag = -1;
		rq->internal_tag = tag;
		@@ -423,7 +425,6 @@ void blk_mq_free_request(struct request *rq)
		atomic_dec(&hctx->nr_active);

		wbt_done(q->rq_wb, &rq->issue_stat);
		rq->rq_flags = 0;

		clear_bit(REQ_ATOM_STARTED, &rq->atomic_flags);
		clear_bit(REQ_ATOM_POLL_SLEPT, &rq->atomic_flags);