io-wq: don't resched if there is no work

This little tweak restores the behaviour that was before the recent
io_worker_handle_work() optimisation patches. It makes the function do
cond_resched() and flush_signals() only if there is an actual work to
execute.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/fs/io-wq.c b/fs/io-wq.c
index 0e7c627..8afe556 100644 (file)
--- a/fs/io-wq.c
+++ b/fs/io-wq.c
@@ -458,10 +458,12 @@ static void io_impersonate_work(struct io_worker *worker,
 static void io_assign_current_work(struct io_worker *worker,
                                   struct io_wq_work *work)
 {
-       /* flush pending signals before assigning new work */
-       if (signal_pending(current))
-               flush_signals(current);
-       cond_resched();
+       if (work) {
+               /* flush pending signals before assigning new work */
+               if (signal_pending(current))
+                       flush_signals(current);
+               cond_resched();
+       }
 
        spin_lock_irq(&worker->lock);
        worker->cur_work = work;