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

This reverts commit 826f2f4. Qian Cai reports that this commit causes stalls with swap. Revert until the reason can be figured out. Reported-by: Qian Cai <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
torvalds · Jul 15, 2020 · e791ee6 · e791ee6
1 parent d0f0f1b
commit e791ee6
Showing 1 changed file with 2 additions and 0 deletions.
diff --git 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