diff options
author | Jens Axboe <axboe@kernel.dk> | 2022-01-19 13:11:58 -0700 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2022-01-19 13:11:58 -0700 |
commit | 73031f761cb7c2397d73957d14d041c31fe58c34 (patch) | |
tree | f0b1fefd54c62164d9ca724ac2b518c07fbd35e3 | |
parent | ccbf726171b7328f800bc98005132fd77eb1a175 (diff) |
io-wq: delete dead lock shuffling codeio_uring-5.17-2022-01-21
We used to have more code around the work loop, but now the goto and
lock juggling just makes it less readable than it should. Get rid of it.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
-rw-r--r-- | fs/io-wq.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/fs/io-wq.c b/fs/io-wq.c index 1efb134c98b7..013e12b9fabf 100644 --- a/fs/io-wq.c +++ b/fs/io-wq.c @@ -547,7 +547,7 @@ static void io_worker_handle_work(struct io_worker *worker) do { struct io_wq_work *work; -get_next: + /* * If we got some work, mark us as busy. If we didn't, but * the list isn't empty, it means we stalled on hashed work. @@ -606,11 +606,6 @@ get_next: spin_unlock_irq(&wq->hash->wait.lock); if (wq_has_sleeper(&wq->hash->wait)) wake_up(&wq->hash->wait); - raw_spin_lock(&wqe->lock); - /* skip unnecessary unlock-lock wqe->lock */ - if (!work) - goto get_next; - raw_spin_unlock(&wqe->lock); } } while (work); |