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>

diff --git a/block/blk-rq-qos.c b/block/blk-rq-qos.c
index 67a0a4c07060b1557f18fcfeb3cf28ea740c95c7..69a0f0b77795a04215f8cf3c6da8bb5287bd621b 100644 (file)
--- 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);
 }