Skip to contentSkip to conversation

io-wq: delete dead lock shuffling code

PATCH New Jens Axboe 1 participant 1 message Jan 20, 2022

Subsystems (2)
lore
Share & tools
lore

Jens Axboe

author maintainer
#0 lore raw

PATCH 1/1 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.

---

Came across this one while looking at related code.

fs/io-wq.c +1 -6
index 1efb134c98b7..013e12b9fabf 100644
@@ -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 @@ static void io_worker_handle_work(struct io_worker *worker)
 				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);
 
Signature · 1 line
Jens Axboe