diff options
| author | Daniel Wagner <wagi@monom.org> | 2018-07-25 12:04:08 +0200 |
|---|---|---|
| committer | Daniel Wagner <wagi@monom.org> | 2018-07-25 12:04:08 +0200 |
| commit | 20b7816ad1d61554599ab7a3483fad4c661c70fe (patch) | |
| tree | 22eb0dbf5cf284596d1f432b549ac672fbb7ec8a /block | |
| parent | 79c82ced6806020fbce8566172ca25296f5dd38b (diff) | |
| parent | 762b585c492fedda1b0bc4c6d0a867307bf7cd0f (diff) | |
Merge tag 'v4.4.144' into v4.4-rt
This is the 4.4.144 stable release
Conflicts:
block/blk-core.c
Diffstat (limited to 'block')
| -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 75a76bcc7ac0..8c94df84f275 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -654,21 +654,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 = swait_event_interruptible(q->mq_freeze_wq, - !atomic_read(&q->mq_freeze_depth) || - blk_queue_dying(q)); + swait_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; } } |