io_uring/zcrx: rename zcrx [un]register functions

Drop "ifqs" from function names, as it refers to an interface queue and
there might be none once a device-less mode is introduced.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://patch.msgid.link/657874acd117ec30fa6f45d9d844471c753b5a0f.1774261953.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
index 34104c256c88f5c359d10a703580f6834051cf51..16122f877aedc7386f44e5c6f62a0690c66e514c 100644 (file)
--- a/io_uring/io_uring.c
+++ b/io_uring/io_uring.c
@@ -2156,7 +2156,7 @@ static __cold void io_ring_ctx_free(struct io_ring_ctx *ctx)
        mutex_lock(&ctx->uring_lock);
        io_sqe_buffers_unregister(ctx);
        io_sqe_files_unregister(ctx);
-       io_unregister_zcrx_ifqs(ctx);
+       io_unregister_zcrx(ctx);
        io_cqring_overflow_kill(ctx);
        io_eventfd_unregister(ctx);
        io_free_alloc_caches(ctx);

diff --git a/io_uring/register.c b/io_uring/register.c
index 489a6feaf228804c5f7ec60ee5cf96f20f8ac7dc..35432471a550f393a6cf60a8f10bfd182413b8bc 100644 (file)
--- a/io_uring/register.c
+++ b/io_uring/register.c
@@ -900,7 +900,7 @@ static int __io_uring_register(struct io_ring_ctx *ctx, unsigned opcode,
                ret = -EINVAL;
                if (!arg || nr_args != 1)
                        break;
-               ret = io_register_zcrx_ifq(ctx, arg);
+               ret = io_register_zcrx(ctx, arg);
                break;
        case IORING_REGISTER_RESIZE_RINGS:
                ret = -EINVAL;

diff --git a/io_uring/zcrx.c b/io_uring/zcrx.c
index e2e0df78dae19ef6d181e36508086dafa413a72e..f94f74d0f566052586770b18a3fdaee5d4e6a4b0 100644 (file)
--- a/io_uring/zcrx.c
+++ b/io_uring/zcrx.c
@@ -816,8 +816,8 @@ netdev_put_unlock:
        return ret;
 }
 
-int io_register_zcrx_ifq(struct io_ring_ctx *ctx,
-                         struct io_uring_zcrx_ifq_reg __user *arg)
+int io_register_zcrx(struct io_ring_ctx *ctx,
+                    struct io_uring_zcrx_ifq_reg __user *arg)
 {
        struct io_uring_zcrx_area_reg area;
        struct io_uring_zcrx_ifq_reg reg;
@@ -955,7 +955,7 @@ void io_terminate_zcrx(struct io_ring_ctx *ctx)
        }
 }
 
-void io_unregister_zcrx_ifqs(struct io_ring_ctx *ctx)
+void io_unregister_zcrx(struct io_ring_ctx *ctx)
 {
        struct io_zcrx_ifq *ifq;
 

diff --git a/io_uring/zcrx.h b/io_uring/zcrx.h
index 3e07238a4eb012cdddc86924d5252775ce92e5c5..75e0a4e6ef6e4b6d7043bc58c080b34720cebdf6 100644 (file)
--- a/io_uring/zcrx.h
+++ b/io_uring/zcrx.h
@@ -76,9 +76,9 @@ struct io_zcrx_ifq {
 
 #if defined(CONFIG_IO_URING_ZCRX)
 int io_zcrx_ctrl(struct io_ring_ctx *ctx, void __user *arg, unsigned nr_arg);
-int io_register_zcrx_ifq(struct io_ring_ctx *ctx,
+int io_register_zcrx(struct io_ring_ctx *ctx,
                         struct io_uring_zcrx_ifq_reg __user *arg);
-void io_unregister_zcrx_ifqs(struct io_ring_ctx *ctx);
+void io_unregister_zcrx(struct io_ring_ctx *ctx);
 void io_terminate_zcrx(struct io_ring_ctx *ctx);
 int io_zcrx_recv(struct io_kiocb *req, struct io_zcrx_ifq *ifq,
                 struct socket *sock, unsigned int flags,
@@ -86,12 +86,12 @@ int io_zcrx_recv(struct io_kiocb *req, struct io_zcrx_ifq *ifq,
 struct io_mapped_region *io_zcrx_get_region(struct io_ring_ctx *ctx,
                                            unsigned int id);
 #else
-static inline int io_register_zcrx_ifq(struct io_ring_ctx *ctx,
-                                       struct io_uring_zcrx_ifq_reg __user *arg)
+static inline int io_register_zcrx(struct io_ring_ctx *ctx,
+                                  struct io_uring_zcrx_ifq_reg __user *arg)
 {
        return -EOPNOTSUPP;
 }
-static inline void io_unregister_zcrx_ifqs(struct io_ring_ctx *ctx)
+static inline void io_unregister_zcrx(struct io_ring_ctx *ctx)
 {
 }
 static inline void io_terminate_zcrx(struct io_ring_ctx *ctx)