Commit 1151a7cc authored by Jens Axboe's avatar Jens Axboe
Browse files

io_uring: move shutdown under the general net section 



Gets rid of some ifdefs and enables use of the net defines for when
CONFIG_NET isn't set.

Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 157dc813

fs/io_uring.c

+29 −36
Original line number Diff line number Diff line
@@ -5113,42 +5113,6 @@ static int io_uring_cmd(struct io_kiocb *req, unsigned int issue_flags) 
	return 0;

}



static int io_shutdown_prep(struct io_kiocb *req,

			    const struct io_uring_sqe *sqe)

{

#if defined(CONFIG_NET)

	if (unlikely(sqe->off || sqe->addr || sqe->rw_flags ||

		     sqe->buf_index || sqe->splice_fd_in))

		return -EINVAL;



	req->shutdown.how = READ_ONCE(sqe->len);

	return 0;

#else

	return -EOPNOTSUPP;

#endif

}



static int io_shutdown(struct io_kiocb *req, unsigned int issue_flags)

{

#if defined(CONFIG_NET)

	struct socket *sock;

	int ret;



	if (issue_flags & IO_URING_F_NONBLOCK)

		return -EAGAIN;



	sock = sock_from_file(req->file);

	if (unlikely(!sock))

		return -ENOTSOCK;



	ret = __sys_shutdown_sock(sock, req->shutdown.how);

	io_req_complete(req, ret);

	return 0;

#else

	return -EOPNOTSUPP;

#endif

}



static int __io_splice_prep(struct io_kiocb *req,

			    const struct io_uring_sqe *sqe)

{
@@ -6073,6 +6037,34 @@ static int io_sync_file_range(struct io_kiocb *req, unsigned int issue_flags) 
}



#if defined(CONFIG_NET)

static int io_shutdown_prep(struct io_kiocb *req,

			    const struct io_uring_sqe *sqe)

{

	if (unlikely(sqe->off || sqe->addr || sqe->rw_flags ||

		     sqe->buf_index || sqe->splice_fd_in))

		return -EINVAL;



	req->shutdown.how = READ_ONCE(sqe->len);

	return 0;

}



static int io_shutdown(struct io_kiocb *req, unsigned int issue_flags)

{

	struct socket *sock;

	int ret;



	if (issue_flags & IO_URING_F_NONBLOCK)

		return -EAGAIN;



	sock = sock_from_file(req->file);

	if (unlikely(!sock))

		return -ENOTSOCK;



	ret = __sys_shutdown_sock(sock, req->shutdown.how);

	io_req_complete(req, ret);

	return 0;

}



static bool io_net_retry(struct socket *sock, int flags)

{

	if (!(flags & MSG_WAITALL))
@@ -6777,6 +6769,7 @@ IO_NETOP_PREP_ASYNC(recvmsg); 
IO_NETOP_PREP_ASYNC(connect);

IO_NETOP_PREP(accept);

IO_NETOP_PREP(socket);

IO_NETOP_PREP(shutdown);

IO_NETOP_FN(send);

IO_NETOP_FN(recv);

#endif /* CONFIG_NET */