Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-26 06:02:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

io-wq: worker idling always returns false

Browse Source 
Remove the bool return, and the checking for it in the caller.

Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Jens Axboe 2021-02-15 13:26:34 -07:00
parent 3bfe610669
commit c6d77d92b7
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/io-wq.c
View File

@ -305,15 +305,13 @@ static void __io_worker_busy(struct io_wqe *wqe, struct io_worker *worker,
* retry the loop in that case (we changed task state), we don't regrab * retry the loop in that case (we changed task state), we don't regrab
* the lock if we return success. * the lock if we return success.
*/ */
static bool __io_worker_idle(struct io_wqe *wqe, struct io_worker *worker) static void __io_worker_idle(struct io_wqe *wqe, struct io_worker *worker)
__must_hold(wqe->lock) __must_hold(wqe->lock)
{ {
if (!(worker->flags & IO_WORKER_F_FREE)) { if (!(worker->flags & IO_WORKER_F_FREE)) {
worker->flags |= IO_WORKER_F_FREE; worker->flags |= IO_WORKER_F_FREE;
hlist_nulls_add_head_rcu(&worker->nulls_node, &wqe->free_list); hlist_nulls_add_head_rcu(&worker->nulls_node, &wqe->free_list);
} }
return false;
} }
static inline unsigned int io_get_work_hash(struct io_wq_work *work) static inline unsigned int io_get_work_hash(struct io_wq_work *work)
@ -454,11 +452,7 @@ loop:
io_worker_handle_work(worker); io_worker_handle_work(worker);
goto loop; goto loop;
} }
/* drops the lock on success, retry */ __io_worker_idle(wqe, worker);
if (__io_worker_idle(wqe, worker)) {
__release(&wqe->lock);
goto loop;
}
raw_spin_unlock_irq(&wqe->lock); raw_spin_unlock_irq(&wqe->lock);
io_flush_signals(); io_flush_signals();
if (schedule_timeout(WORKER_IDLE_TIMEOUT)) if (schedule_timeout(WORKER_IDLE_TIMEOUT))