From: Jens Axboe <axboe@kernel.dk>
Date: Fri, 23 Oct 2020 02:17:18 +0000 (-0600)
Subject: io_uring: JOBCTL_TASK_WORK is no longer used by task_work
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=792ee0f6db5b942ee68ee7c9aea9d34dde4c4ff2;p=linux.git

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>
---

diff --git a/fs/io_uring.c b/fs/io_uring.c
index 8018c7076b25c..a170488507cff 100644
--- 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;
 }