diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-12 11:48:02 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-12 11:48:02 -0800 |
| commit | c6d8570e4d642a0c0bfbe7362ffa1b1433c72db1 (patch) | |
| tree | 9644823f7df64364f458d06a373e40c9f3e89ed7 /fs | |
| parent | Merge tag 'drm-fixes-2021-02-12' of git://anongit.freedesktop.org/drm/drm (diff) | |
| parent | Revert "io_uring: don't take fs for recvmsg/sendmsg" (diff) | |
| download | wireguard-linux-c6d8570e4d642a0c0bfbe7362ffa1b1433c72db1.tar.xz wireguard-linux-c6d8570e4d642a0c0bfbe7362ffa1b1433c72db1.zip | |
Merge tag 'io_uring-5.11-2021-02-12' of git://git.kernel.dk/linux-block
Pull io_uring fix from Jens Axboe:
"Revert of a patch from this release that caused a regression"
* tag 'io_uring-5.11-2021-02-12' of git://git.kernel.dk/linux-block:
Revert "io_uring: don't take fs for recvmsg/sendmsg"
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/io_uring.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index 1f68105a41ed..931671082e61 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -857,7 +857,8 @@ static const struct io_op_def io_op_defs[] = { .pollout = 1, .needs_async_data = 1, .async_size = sizeof(struct io_async_msghdr), - .work_flags = IO_WQ_WORK_MM | IO_WQ_WORK_BLKCG, + .work_flags = IO_WQ_WORK_MM | IO_WQ_WORK_BLKCG | + IO_WQ_WORK_FS, }, [IORING_OP_RECVMSG] = { .needs_file = 1, @@ -866,7 +867,8 @@ static const struct io_op_def io_op_defs[] = { .buffer_select = 1, .needs_async_data = 1, .async_size = sizeof(struct io_async_msghdr), - .work_flags = IO_WQ_WORK_MM | IO_WQ_WORK_BLKCG, + .work_flags = IO_WQ_WORK_MM | IO_WQ_WORK_BLKCG | + IO_WQ_WORK_FS, }, [IORING_OP_TIMEOUT] = { .needs_async_data = 1, |