Commit 2d199895 authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe
Browse files

io_uring: remove F_NEED_CLEANUP check in *prep() 



REQ_F_NEED_CLEANUP is set only by io_*_prep() and they're guaranteed to
be called only once, so there is no one who may have set the flag
before. Kill REQ_F_NEED_CLEANUP check in these *prep() handlers.

Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 5b09e37e

fs/io_uring.c

+2 −16
Original line number Diff line number Diff line
@@ -3157,7 +3157,7 @@ static int io_read_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe, 
		return -EBADF;



	/* either don't need iovec imported or already have it */

	if (!req->async_data || req->flags & REQ_F_NEED_CLEANUP)

	if (!req->async_data)

		return 0;

	return io_rw_prep_async(req, READ, force_nonblock);

}
@@ -3381,7 +3381,7 @@ static int io_write_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe, 
		return -EBADF;



	/* either don't need iovec imported or already have it */

	if (!req->async_data || req->flags & REQ_F_NEED_CLEANUP)

	if (!req->async_data)

		return 0;

	return io_rw_prep_async(req, WRITE, force_nonblock);

}
@@ -3482,8 +3482,6 @@ static int __io_splice_prep(struct io_kiocb *req, 
	unsigned int valid_flags = SPLICE_F_FD_IN_FIXED | SPLICE_F_ALL;

	int ret;



	if (req->flags & REQ_F_NEED_CLEANUP)

		return 0;

	if (unlikely(req->ctx->flags & IORING_SETUP_IOPOLL))

		return -EINVAL;
@@ -3693,8 +3691,6 @@ static int io_openat_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) 


	if (unlikely(req->ctx->flags & (IORING_SETUP_IOPOLL|IORING_SETUP_SQPOLL)))

		return -EINVAL;

	if (req->flags & REQ_F_NEED_CLEANUP)

		return 0;

	mode = READ_ONCE(sqe->len);

	flags = READ_ONCE(sqe->open_flags);

	req->open.how = build_open_how(flags, mode);
@@ -3709,8 +3705,6 @@ static int io_openat2_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) 


	if (unlikely(req->ctx->flags & (IORING_SETUP_IOPOLL|IORING_SETUP_SQPOLL)))

		return -EINVAL;

	if (req->flags & REQ_F_NEED_CLEANUP)

		return 0;

	how = u64_to_user_ptr(READ_ONCE(sqe->addr2));

	len = READ_ONCE(sqe->len);

	if (len < OPEN_HOW_SIZE_VER0)
@@ -4218,10 +4212,6 @@ static int io_sendmsg_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) 


	if (!async_msg || !io_op_defs[req->opcode].needs_async_data)

		return 0;

	/* iovec is already imported */

	if (req->flags & REQ_F_NEED_CLEANUP)

		return 0;



	ret = io_sendmsg_copy_hdr(req, async_msg);

	if (!ret)

		req->flags |= REQ_F_NEED_CLEANUP;
@@ -4448,10 +4438,6 @@ static int io_recvmsg_prep(struct io_kiocb *req, 


	if (!async_msg || !io_op_defs[req->opcode].needs_async_data)

		return 0;

	/* iovec is already imported */

	if (req->flags & REQ_F_NEED_CLEANUP)

		return 0;



	ret = io_recvmsg_copy_hdr(req, async_msg);

	if (!ret)

		req->flags |= REQ_F_NEED_CLEANUP;