diff options
| author | Jens Axboe <axboe@kernel.dk> | 2021-01-19 15:53:54 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2021-02-01 10:02:43 -0700 |
| commit | 4014d943cb62db892eb023d385a966a3fce5ee4c (patch) | |
| tree | 2f529922e136f81793e1d6d1de3afbde5e8e6f62 /fs/io_uring.c | |
| parent | 9eac1904d3364254d622bf2c771c4f85cd435fc2 (diff) | |
| download | lwn-4014d943cb62db892eb023d385a966a3fce5ee4c.tar.gz lwn-4014d943cb62db892eb023d385a966a3fce5ee4c.zip | |
io_uring/io-wq: kill off now unused IO_WQ_WORK_NO_CANCEL
It's no longer used as IORING_OP_CLOSE got rid for the need of flagging
it as uncancelable, kill it of.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'fs/io_uring.c')
| -rw-r--r-- | fs/io_uring.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index 4dd18c81789c..be73f6ddbd9e 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -6386,11 +6386,8 @@ static struct io_wq_work *io_wq_submit_work(struct io_wq_work *work) if (timeout) io_queue_linked_timeout(timeout); - /* if NO_CANCEL is set, we must still run the work */ - if ((work->flags & (IO_WQ_WORK_CANCEL|IO_WQ_WORK_NO_CANCEL)) == - IO_WQ_WORK_CANCEL) { + if (work->flags & IO_WQ_WORK_CANCEL) ret = -ECANCELED; - } if (!ret) { do { |