Commit 239ad215 authored May 08, 2015 by Shaohua Li Committed by Jens Axboe May 08, 2015

blk-mq: avoid re-initialize request which is failed in direct dispatch



If we directly issue a request and it fails, we use
blk_mq_merge_queue_io(). But we already assigned bio to a request in
blk_mq_bio_to_request. blk_mq_merge_queue_io shouldn't run
blk_mq_bio_to_request again.

Signed-off-by: Shaohua Li <shli@fb.com>
Signed-off-by: Jens Axboe <axboe@fb.com>

parent e6c4438b

block/blk-mq.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1284,6 +1284,8 @@ static void blk_mq_make_request(struct request_queue q, struct bio bio)
	blk_mq_end_request(rq, rq->errors);		blk_mq_end_request(rq, rq->errors);
	goto done;		goto done;
	}		}
			blk_mq_insert_request(rq, false, true, true);
			return;
	}		}
	}		}