Skip to content

Commit 73031f7

Browse files
committed
io-wq: delete dead lock shuffling code
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>
1 parent ccbf726 commit 73031f7

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

fs/io-wq.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,7 @@ static void io_worker_handle_work(struct io_worker *worker)
547547

548548
do {
549549
struct io_wq_work *work;
550-
get_next:
550+
551551
/*
552552
* If we got some work, mark us as busy. If we didn't, but
553553
* the list isn't empty, it means we stalled on hashed work.
@@ -606,11 +606,6 @@ static void io_worker_handle_work(struct io_worker *worker)
606606
spin_unlock_irq(&wq->hash->wait.lock);
607607
if (wq_has_sleeper(&wq->hash->wait))
608608
wake_up(&wq->hash->wait);
609-
raw_spin_lock(&wqe->lock);
610-
/* skip unnecessary unlock-lock wqe->lock */
611-
if (!work)
612-
goto get_next;
613-
raw_spin_unlock(&wqe->lock);
614609
}
615610
} while (work);
616611

0 commit comments

Comments
 (0)