diff options
| author |   Pavel Begunkov <asml.silence@gmail.com> | 2020-03-02 23:46:10 +0300 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2020-03-02 14:03:24 -0700 |
| commit | 80ad894382bf1d73eb688c29714fa10c0afcf2e7 (patch) | |
| tree | 9526fe46a1ea291ee4e7cba8ffe8b50dc3b0eddc /fs/io-wq.h | |
| parent | io-wq: fix IO_WQ_WORK_NO_CANCEL cancellation (diff) | |
| download | linux-dev-80ad894382bf1d73eb688c29714fa10c0afcf2e7.tar.xz linux-dev-80ad894382bf1d73eb688c29714fa10c0afcf2e7.zip | |
io-wq: remove io_wq_flush and IO_WQ_WORK_INTERNAL
io_wq_flush() is buggy, during cancelation of a flush, the associated
work may be passed to the caller's (i.e. io_uring) @match callback. That
callback is expecting it to be embedded in struct io_kiocb. Cancelation
of internal work probably doesn't make a lot of sense to begin with.
As the flush helper is no longer used, just delete it and the associated
work flag.
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to '')
| -rw-r--r-- | fs/io-wq.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/io-wq.h b/fs/io-wq.h index 33baba4370c5..e5e15f2c93ec 100644 --- a/fs/io-wq.h +++ b/fs/io-wq.h @@ -8,7 +8,6 @@ enum { IO_WQ_WORK_HAS_MM = 2, IO_WQ_WORK_HASHED = 4, IO_WQ_WORK_UNBOUND = 32, - IO_WQ_WORK_INTERNAL = 64, IO_WQ_WORK_CB = 128, IO_WQ_WORK_NO_CANCEL = 256, IO_WQ_WORK_CONCURRENT = 512, @@ -100,7 +99,6 @@ void io_wq_destroy(struct io_wq *wq); void io_wq_enqueue(struct io_wq *wq, struct io_wq_work *work); void io_wq_enqueue_hashed(struct io_wq *wq, struct io_wq_work *work, void *val); -void io_wq_flush(struct io_wq *wq); void io_wq_cancel_all(struct io_wq *wq); enum io_wq_cancel io_wq_cancel_work(struct io_wq *wq, struct io_wq_work *cwork); |