Commit 469956e8 authored by YueHaibing's avatar YueHaibing Committed by Jens Axboe
Browse files

io_uring: Fix unused function warnings 



If CONFIG_NET is not set, gcc warns:

fs/io_uring.c:3110:12: warning: io_setup_async_msg defined but not used [-Wunused-function]
 static int io_setup_async_msg(struct io_kiocb *req,
            ^~~~~~~~~~~~~~~~~~

There are many funcions wraped by CONFIG_NET, move them
together to simplify code, also fix this warning.

Reported-by: default avatarHulk Robot <hulkci@huawei.com>
Signed-off-by: default avatarYueHaibing <yuehaibing@huawei.com>

Minor tweaks.

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

fs/io_uring.c

+52 −42
Original line number Diff line number Diff line
@@ -3477,6 +3477,7 @@ static int io_sync_file_range(struct io_kiocb *req, bool force_nonblock) 
	return 0;

}



#if defined(CONFIG_NET)

static int io_setup_async_msg(struct io_kiocb *req,

			      struct io_async_msghdr *kmsg)

{
@@ -3494,7 +3495,6 @@ static int io_setup_async_msg(struct io_kiocb *req, 


static int io_sendmsg_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)

{

#if defined(CONFIG_NET)

	struct io_sr_msg *sr = &req->sr_msg;

	struct io_async_ctx *io = req->io;

	int ret;
@@ -3520,14 +3520,10 @@ static int io_sendmsg_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) 
	if (!ret)

		req->flags |= REQ_F_NEED_CLEANUP;

	return ret;

#else

	return -EOPNOTSUPP;

#endif

}



static int io_sendmsg(struct io_kiocb *req, bool force_nonblock)

{

#if defined(CONFIG_NET)

	struct io_async_msghdr *kmsg = NULL;

	struct socket *sock;

	int ret;
@@ -3581,14 +3577,10 @@ static int io_sendmsg(struct io_kiocb *req, bool force_nonblock) 
		req_set_fail_links(req);

	io_put_req(req);

	return 0;

#else

	return -EOPNOTSUPP;

#endif

}



static int io_send(struct io_kiocb *req, bool force_nonblock)

{

#if defined(CONFIG_NET)

	struct socket *sock;

	int ret;
@@ -3631,9 +3623,6 @@ static int io_send(struct io_kiocb *req, bool force_nonblock) 
		req_set_fail_links(req);

	io_put_req(req);

	return 0;

#else

	return -EOPNOTSUPP;

#endif

}



static int __io_recvmsg_copy_hdr(struct io_kiocb *req, struct io_async_ctx *io)
@@ -3746,7 +3735,6 @@ static struct io_buffer *io_recv_buffer_select(struct io_kiocb *req, 
static int io_recvmsg_prep(struct io_kiocb *req,

			   const struct io_uring_sqe *sqe)

{

#if defined(CONFIG_NET)

	struct io_sr_msg *sr = &req->sr_msg;

	struct io_async_ctx *io = req->io;

	int ret;
@@ -3771,14 +3759,10 @@ static int io_recvmsg_prep(struct io_kiocb *req, 
	if (!ret)

		req->flags |= REQ_F_NEED_CLEANUP;

	return ret;

#else

	return -EOPNOTSUPP;

#endif

}



static int io_recvmsg(struct io_kiocb *req, bool force_nonblock)

{

#if defined(CONFIG_NET)

	struct io_async_msghdr *kmsg = NULL;

	struct socket *sock;

	int ret, cflags = 0;
@@ -3839,14 +3823,10 @@ static int io_recvmsg(struct io_kiocb *req, bool force_nonblock) 
		req_set_fail_links(req);

	io_put_req(req);

	return 0;

#else

	return -EOPNOTSUPP;

#endif

}



static int io_recv(struct io_kiocb *req, bool force_nonblock)

{

#if defined(CONFIG_NET)

	struct io_buffer *kbuf = NULL;

	struct socket *sock;

	int ret, cflags = 0;
@@ -3903,15 +3883,10 @@ static int io_recv(struct io_kiocb *req, bool force_nonblock) 
		req_set_fail_links(req);

	io_put_req(req);

	return 0;

#else

	return -EOPNOTSUPP;

#endif

}





static int io_accept_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)

{

#if defined(CONFIG_NET)

	struct io_accept *accept = &req->accept;



	if (unlikely(req->ctx->flags & (IORING_SETUP_IOPOLL|IORING_SETUP_SQPOLL)))
@@ -3923,12 +3898,8 @@ static int io_accept_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) 
	accept->addr_len = u64_to_user_ptr(READ_ONCE(sqe->addr2));

	accept->flags = READ_ONCE(sqe->accept_flags);

	return 0;

#else

	return -EOPNOTSUPP;

#endif

}



#if defined(CONFIG_NET)

static int __io_accept(struct io_kiocb *req, bool force_nonblock)

{

	struct io_accept *accept = &req->accept;
@@ -3958,11 +3929,9 @@ static void io_accept_finish(struct io_wq_work **workptr) 
	__io_accept(req, false);

	io_steal_work(req, workptr);

}

#endif



static int io_accept(struct io_kiocb *req, bool force_nonblock)

{

#if defined(CONFIG_NET)

	int ret;



	ret = __io_accept(req, force_nonblock);
@@ -3971,14 +3940,10 @@ static int io_accept(struct io_kiocb *req, bool force_nonblock) 
		return -EAGAIN;

	}

	return 0;

#else

	return -EOPNOTSUPP;

#endif

}



static int io_connect_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)

{

#if defined(CONFIG_NET)

	struct io_connect *conn = &req->connect;

	struct io_async_ctx *io = req->io;
@@ -3995,14 +3960,10 @@ static int io_connect_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) 


	return move_addr_to_kernel(conn->addr, conn->addr_len,

					&io->connect.address);

#else

	return -EOPNOTSUPP;

#endif

}



static int io_connect(struct io_kiocb *req, bool force_nonblock)

{

#if defined(CONFIG_NET)

	struct io_async_ctx __io, *io;

	unsigned file_flags;

	int ret;
@@ -4040,10 +4001,59 @@ out: 
	io_cqring_add_event(req, ret);

	io_put_req(req);

	return 0;

#else

}

#else /* !CONFIG_NET */

static int io_sendmsg_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)

{

	return -EOPNOTSUPP;

}



static int io_sendmsg(struct io_kiocb *req, bool force_nonblock)

{

	return -EOPNOTSUPP;

}



static int io_send(struct io_kiocb *req, bool force_nonblock)

{

	return -EOPNOTSUPP;

}



static int io_recvmsg_prep(struct io_kiocb *req,

			   const struct io_uring_sqe *sqe)

{

	return -EOPNOTSUPP;

}



static int io_recvmsg(struct io_kiocb *req, bool force_nonblock)

{

	return -EOPNOTSUPP;

}



static int io_recv(struct io_kiocb *req, bool force_nonblock)

{

	return -EOPNOTSUPP;

}



static int io_accept_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)

{

	return -EOPNOTSUPP;

}



static int io_accept(struct io_kiocb *req, bool force_nonblock)

{

	return -EOPNOTSUPP;

}



static int io_connect_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)

{

	return -EOPNOTSUPP;

}



static int io_connect(struct io_kiocb *req, bool force_nonblock)

{

	return -EOPNOTSUPP;

#endif

}

#endif /* CONFIG_NET */



struct io_poll_table {

	struct poll_table_struct pt;

CRA Git | Maintained and supported by SUSTech CRA and CCSE