Revert "blk-rq-qos: remove redundant finish_wait to rq_qos_wait."

This reverts commit 826f2f48da8c331ac51e1381998d318012d66550.

Qian Cai reports that this commit causes stalls with swap. Revert until
the reason can be figured out.

Reported-by: Qian Cai <cai@lca.pw>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/blk-rq-qos.c b/block/blk-rq-qos.c
index 18f3eab9f768a7a0a7438210e7fa9c46aa622ff8..656460636ad34a176297bfb991aba977b3c0e9ca 100644 (file)
--- a/block/blk-rq-qos.c
+++ b/block/blk-rq-qos.c
@@ -273,6 +273,8 @@ void rq_qos_wait(struct rq_wait *rqw, void *private_data,
                if (data.got_token)
                        break;
                if (!has_sleeper && acquire_inflight_cb(rqw, private_data)) {
+                       finish_wait(&rqw->wait, &data.wq);
+
                        /*
                         * We raced with wbt_wake_function() getting a token,
                         * which means we now have two. Put our local token