io_uring/net: rename io_sendzc()

[ upstream commit b0e9b5517eb12fa80c72e205fe28534c2e2f39b9 ]

Simple renaming of io_sendzc*() functions in preparatio to adding
a zerocopy sendmsg variant.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/265af46829e6076dd220011b1858dc3151969226.1663668091.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/io_uring/net.c b/io_uring/net.c
index 68638e76c50df514331c1122926bff5843b11112..a09611d25a0696034ae30ae0cd8dc88d1bc958d4 100644 (file)
--- a/io_uring/net.c
+++ b/io_uring/net.c
@@ -875,7 +875,7 @@ out_free:
        return ret;
 }
 
-void io_sendzc_cleanup(struct io_kiocb *req)
+void io_send_zc_cleanup(struct io_kiocb *req)
 {
        struct io_sr_msg *zc = io_kiocb_to_cmd(req, struct io_sr_msg);
 
@@ -884,7 +884,7 @@ void io_sendzc_cleanup(struct io_kiocb *req)
        zc->notif = NULL;
 }
 
-int io_sendzc_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
+int io_send_zc_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
 {
        struct io_sr_msg *zc = io_kiocb_to_cmd(req, struct io_sr_msg);
        struct io_ring_ctx *ctx = req->ctx;
@@ -989,7 +989,7 @@ static int io_sg_from_iter(struct sock *sk, struct sk_buff *skb,
        return ret;
 }
 
-int io_sendzc(struct io_kiocb *req, unsigned int issue_flags)
+int io_send_zc(struct io_kiocb *req, unsigned int issue_flags)
 {
        struct sockaddr_storage __address, *addr = NULL;
        struct io_sr_msg *zc = io_kiocb_to_cmd(req, struct io_sr_msg);

diff --git a/io_uring/net.h b/io_uring/net.h
index e7366aac335c2d455a481d72db859f82e84e9987..4090d008fd55a14703a45055a950c11b75dd7837 100644 (file)
--- a/io_uring/net.h
+++ b/io_uring/net.h
@@ -55,9 +55,9 @@ int io_connect_prep_async(struct io_kiocb *req);
 int io_connect_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe);
 int io_connect(struct io_kiocb *req, unsigned int issue_flags);
 
-int io_sendzc(struct io_kiocb *req, unsigned int issue_flags);
-int io_sendzc_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe);
-void io_sendzc_cleanup(struct io_kiocb *req);
+int io_send_zc(struct io_kiocb *req, unsigned int issue_flags);
+int io_send_zc_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe);
+void io_send_zc_cleanup(struct io_kiocb *req);
 void io_send_zc_fail(struct io_kiocb *req);
 
 void io_netmsg_cache_free(struct io_cache_entry *entry);

diff --git a/io_uring/opdef.c b/io_uring/opdef.c
index c08d65d77cba678152feb9a20b9ff84547742da8..3b15cdb6dbbc5d9d131d22b488d9d1bd1f5dca66 100644 (file)
--- a/io_uring/opdef.c
+++ b/io_uring/opdef.c
@@ -490,10 +490,10 @@ const struct io_op_def io_op_defs[] = {
                .manual_alloc           = 1,
 #if defined(CONFIG_NET)
                .async_size             = sizeof(struct io_async_msghdr),
-               .prep                   = io_sendzc_prep,
-               .issue                  = io_sendzc,
+               .prep                   = io_send_zc_prep,
+               .issue                  = io_send_zc,
                .prep_async             = io_sendzc_prep_async,
-               .cleanup                = io_sendzc_cleanup,
+               .cleanup                = io_send_zc_cleanup,
                .fail                   = io_send_zc_fail,
 #else
                .prep                   = io_eopnotsupp_prep,