diff options
| author | Mark Brown <broonie@kernel.org> | 2018-07-25 17:34:32 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-07-25 17:34:32 +0100 |
| commit | 606b3effb9ce2ab6f67eeecace381c701d411ecf (patch) | |
| tree | 2f9478b4cdd0703734c76570f61309b304de0933 /block/blk-core.c | |
| parent | 1c6a1d5ae62dbaec8922761f56332e6e830b32a4 (diff) | |
| parent | 762b585c492fedda1b0bc4c6d0a867307bf7cd0f (diff) | |
Merge tag 'v4.4.144' into linux-linaro-lsk-v4.4lsk-v4.4-18.07
This is the 4.4.144 stable release
Diffstat (limited to 'block/blk-core.c')
| -rw-r--r-- | block/blk-core.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index f5f1a55703ae..50d77c90070d 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -651,21 +651,17 @@ EXPORT_SYMBOL(blk_alloc_queue); int blk_queue_enter(struct request_queue *q, gfp_t gfp) { while (true) { - int ret; - if (percpu_ref_tryget_live(&q->q_usage_counter)) return 0; if (!gfpflags_allow_blocking(gfp)) return -EBUSY; - ret = wait_event_interruptible(q->mq_freeze_wq, - !atomic_read(&q->mq_freeze_depth) || - blk_queue_dying(q)); + wait_event(q->mq_freeze_wq, + !atomic_read(&q->mq_freeze_depth) || + blk_queue_dying(q)); if (blk_queue_dying(q)) return -ENODEV; - if (ret) - return ret; } } |