diff options
| author | Jens Axboe <axboe@fb.com> | 2017-04-20 17:23:13 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-04-20 17:23:13 -0600 |
| commit | 5feeacdd4a75bc6e5c6c613ae09ef07bc5dfd05a (patch) | |
| tree | a0ee5921bc165f4680fc0afa35250217298fec48 /block | |
| parent | 0206319fdfee7c36b97aa6c0561bab206132f813 (diff) | |
| download | blackbird-op-linux-5feeacdd4a75bc6e5c6c613ae09ef07bc5dfd05a.tar.gz blackbird-op-linux-5feeacdd4a75bc6e5c6c613ae09ef07bc5dfd05a.zip | |
blk-mq: add might_sleep check to blk_mq_get_driver_tag()
If the caller passes in wait=true, it has to be able to block
for a driver tag. We just had a bug where flush insertion
would block on tag allocation, while we had preempt disabled.
Ensure that we catch cases like that earlier next time.
Reviewed-by: Bart Van Assche <Bart.VanAssche@sandisk.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-mq.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c index b6dc9ba38e35..fa7d86f59687 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -864,6 +864,8 @@ bool blk_mq_get_driver_tag(struct request *rq, struct blk_mq_hw_ctx **hctx, .flags = wait ? 0 : BLK_MQ_REQ_NOWAIT, }; + might_sleep_if(wait); + if (rq->tag != -1) goto done; |
