Skip to content

Commit c6d8570

Browse files
committed
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"
2 parents a81bfdf + 92c75f7 commit c6d8570

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

fs/io_uring.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -857,7 +857,8 @@ static const struct io_op_def io_op_defs[] = {
857857
.pollout = 1,
858858
.needs_async_data = 1,
859859
.async_size = sizeof(struct io_async_msghdr),
860-
.work_flags = IO_WQ_WORK_MM | IO_WQ_WORK_BLKCG,
860+
.work_flags = IO_WQ_WORK_MM | IO_WQ_WORK_BLKCG |
861+
IO_WQ_WORK_FS,
861862
},
862863
[IORING_OP_RECVMSG] = {
863864
.needs_file = 1,
@@ -866,7 +867,8 @@ static const struct io_op_def io_op_defs[] = {
866867
.buffer_select = 1,
867868
.needs_async_data = 1,
868869
.async_size = sizeof(struct io_async_msghdr),
869-
.work_flags = IO_WQ_WORK_MM | IO_WQ_WORK_BLKCG,
870+
.work_flags = IO_WQ_WORK_MM | IO_WQ_WORK_BLKCG |
871+
IO_WQ_WORK_FS,
870872
},
871873
[IORING_OP_TIMEOUT] = {
872874
.needs_async_data = 1,

0 commit comments

Comments
 (0)