Commit c6d8570e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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"
parents a81bfdf8 92c75f75

fs/io_uring.c

+4 −2
Original line number Diff line number Diff line
@@ -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,