diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-03 19:43:56 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-03 19:43:56 +0200 |
| commit | 71abe04269ae0b98928d5905bf2748d3a39c6e93 (patch) | |
| tree | 5225b72550df12a561b44e0a171da271fa54245c /block | |
| parent | Merge tag 'nfs-for-4.18-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs (diff) | |
| parent | blk-mq: fix blk_mq_tagset_busy_iter (diff) | |
| download | linux-71abe04269ae0b98928d5905bf2748d3a39c6e93.tar.xz linux-71abe04269ae0b98928d5905bf2748d3a39c6e93.zip | |
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
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-mq-tag.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-mq-tag.c b/block/blk-mq-tag.c index 09b2ee6694fb..3de0836163c2 100644 --- a/block/blk-mq-tag.c +++ b/block/blk-mq-tag.c @@ -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; |