Commit 878eb6e4 authored by Al Viro's avatar Al Viro Committed by Jens Axboe
Browse files

block: blk_add_rq_to_plug(): clear stale 'last' after flush 



blk_mq_flush_plug_list() empties ->mq_list and request we'd peeked there
before that call is gone; in any case, we are not dealing with a mix
of requests for different queues now - there's no requests left in the
plug.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 943f45b9

block/blk-mq.c

+1 −0
Original line number Diff line number Diff line
@@ -1262,6 +1262,7 @@ static void blk_add_rq_to_plug(struct blk_plug *plug, struct request *rq) 
		   (!blk_queue_nomerges(rq->q) &&

		    blk_rq_bytes(last) >= BLK_PLUG_FLUSH_SIZE)) {

		blk_mq_flush_plug_list(plug, false);

		last = NULL;

		trace_block_plug(rq->q);

	}