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

Commit 71abe042 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-20180803' of git://git.kernel.dk/linux-block 

Pull block fix from Jens Axboe:
 "Just a single fix, from Ming, fixing a regression in this cycle where
  the busy tag iteration was changed to only calling the callback
  function for requests that are started. We really want all non-free
  requests.

  This fixes a boot regression on certain VM setups"

* tag 'for-linus-20180803' of git://git.kernel.dk/linux-block:
  blk-mq: fix blk_mq_tagset_busy_iter
parents 310810ae 2d5ba0e2

block/blk-mq-tag.c

+1 −1
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ static bool bt_tags_iter(struct sbitmap *bitmap, unsigned int bitnr, void *data) 
	 * test and set the bit before assining ->rqs[].

	 */

	rq = tags->rqs[bitnr];

	if (rq && blk_mq_rq_state(rq) == MQ_RQ_IN_FLIGHT)

	if (rq && blk_mq_request_started(rq))

		iter_data->fn(rq, iter_data->data, reserved);



	return true;