io_uring: JOBCTL_TASK_WORK is no longer used by task_work

Remove the dead code, TWA_SIGNAL will never set JOBCTL_TASK_WORK at this point. Signed-off-by: Jens Axboe <axboe@kernel.dk>
mariux64 · Dec 12, 2020 · 792ee0f · 792ee0f
1 parent 03941cc
commit 792ee0f
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/fs/io_uring.c b/fs/io_uring.c
@@ -6846,13 +6846,8 @@ static int io_run_task_work_sig(void)
 		return 1;
 	if (!signal_pending(current))
 		return 0;
-	if (current->jobctl & JOBCTL_TASK_WORK) {
-		spin_lock_irq(&current->sighand->siglock);
-		current->jobctl &= ~JOBCTL_TASK_WORK;
-		recalc_sigpending();
-		spin_unlock_irq(&current->sighand->siglock);
-		return 1;
-	}
+	if (test_tsk_thread_flag(current, TIF_NOTIFY_SIGNAL))
+		return -ERESTARTSYS;
 	return -EINTR;
 }