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

io_uring/net: make io_net_vec_assign() return void 



io_net_vec_assign() can only return 0 and it doesn't make sense for it
to fail, so make it return void.

Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Reviewed-by: default avatarGabriel Krisman Bertazi <krisman@suse.de>
Link: https://lore.kernel.org/r/7c1a2390c99e17d3ae4e8562063e572d3cdeb164.1738087204.git.asml.silence@gmail.com


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

io_uring/net.c

+5 −4
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ static struct io_async_msghdr *io_msg_alloc_async(struct io_kiocb *req) 
}



/* assign new iovec to kmsg, if we need to */

static int io_net_vec_assign(struct io_kiocb *req, struct io_async_msghdr *kmsg,

static void io_net_vec_assign(struct io_kiocb *req, struct io_async_msghdr *kmsg,

			     struct iovec *iov)

{

	if (iov) {
@@ -178,7 +178,6 @@ static int io_net_vec_assign(struct io_kiocb *req, struct io_async_msghdr *kmsg, 
			kfree(kmsg->free_iov);

		kmsg->free_iov = iov;

	}

	return 0;

}



static inline void io_mshot_prep_retry(struct io_kiocb *req,
@@ -240,7 +239,8 @@ static int io_compat_msg_copy_hdr(struct io_kiocb *req, 
	if (unlikely(ret < 0))

		return ret;



	return io_net_vec_assign(req, iomsg, iov);

	io_net_vec_assign(req, iomsg, iov);

	return 0;

}

#endif
@@ -299,7 +299,8 @@ static int io_msg_copy_hdr(struct io_kiocb *req, struct io_async_msghdr *iomsg, 
	if (unlikely(ret < 0))

		return ret;



	return io_net_vec_assign(req, iomsg, iov);

	io_net_vec_assign(req, iomsg, iov);

	return 0;

}



static int io_sendmsg_copy_hdr(struct io_kiocb *req,