aboutsummaryrefslogtreecommitdiff
path: root/fs/io_uring.c
diff options
context:
space:
mode:
authorJens Axboe2020-10-22 20:17:18 -0600
committerJens Axboe2020-12-12 09:17:38 -0700
commit792ee0f6db5b942ee68ee7c9aea9d34dde4c4ff2 (patch)
tree2acc65b0e071b7c2ade27c7f8b74185748a89130 /fs/io_uring.c
parent03941ccfda161c2680147fa5ab92aead2a79cac1 (diff)
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>
Diffstat (limited to 'fs/io_uring.c')
-rw-r--r--fs/io_uring.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c
index 8018c7076b25..a170488507cf 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;
}