summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorJosef Bacik <josef@toxicpanda.com>2019-07-16 16:19:27 -0400
committerJens Axboe <axboe@kernel.dk>2019-07-18 10:20:13 -0600
commit64e7ea875ef63b2801be7954cf7257d1bfccc266 (patch)
treeb14ba8e125ed21dbfcb64280894995436258f505 /block
parent545fbd0775bafcefc8f7bc844291bd13c44b7fdc (diff)
downloadlinux-0-day-64e7ea875ef63b2801be7954cf7257d1bfccc266.tar.gz
linux-0-day-64e7ea875ef63b2801be7954cf7257d1bfccc266.tar.xz
rq-qos: don't reset has_sleepers on spurious wakeups
If we raced with somebody else getting an inflight counter we could fail to get an inflight counter with no sleepers on the list, and thus need to go to sleep. In this case has_sleepers should be true because we are now relying on the waker to get our inflight counter for us. And in the case of spurious wakeups we'd still want this to be the case. So set has_sleepers to true if we went to sleep to make sure we're woken up the proper way. Reviewed-by: Oleg Nesterov <oleg@redhat.com> Signed-off-by: Josef Bacik <josef@toxicpanda.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
-rw-r--r--block/blk-rq-qos.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-rq-qos.c b/block/blk-rq-qos.c
index 67a0a4c07060b..69a0f0b77795a 100644
--- a/block/blk-rq-qos.c
+++ b/block/blk-rq-qos.c
@@ -261,7 +261,7 @@ void rq_qos_wait(struct rq_wait *rqw, void *private_data,
break;
}
io_schedule();
- has_sleeper = false;
+ has_sleeper = true;
} while (1);
finish_wait(&rqw->wait, &data.wq);
}