io_uring: rename "copy buffers" to "clone buffers"

A recent commit added support for copying registered buffers from one
ring to another. But that term is a bit confusing, as no copying of
buffer data is done here. What is being done is simply cloning the
buffer registrations from one ring to another.

Rename it while we still can, so that it's more descriptive. No
functional changes in this patch.

Fixes: 7cc2a6eadcd7 ("io_uring: add IORING_REGISTER_COPY_BUFFERS method")
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.h
index 9dc5bb428c8a332df541e053b7affb9bb63cdfac..1fe79e750470bf7f84eb0413fc1abc49c6167bae 100644 (file)
--- a/include/uapi/linux/io_uring.h
+++ b/include/uapi/linux/io_uring.h
@@ -609,8 +609,8 @@ enum io_uring_register_op {
 
        IORING_REGISTER_CLOCK                   = 29,
 
-       /* copy registered buffers from source ring to current ring */
-       IORING_REGISTER_COPY_BUFFERS            = 30,
+       /* clone registered buffers from source ring to current ring */
+       IORING_REGISTER_CLONE_BUFFERS           = 30,
 
        /* this goes last */
        IORING_REGISTER_LAST,
@@ -701,7 +701,7 @@ enum {
        IORING_REGISTER_SRC_REGISTERED = 1,
 };
 
-struct io_uring_copy_buffers {
+struct io_uring_clone_buffers {
        __u32   src_fd;
        __u32   flags;
        __u32   pad[6];

diff --git a/io_uring/register.c b/io_uring/register.c
index dab0f8024ddf35e998e6229df933c59cd946a1ce..b8a48a6a89ee5252a4b718d0269f57556eaff57c 100644 (file)
--- a/io_uring/register.c
+++ b/io_uring/register.c
@@ -542,11 +542,11 @@ static int __io_uring_register(struct io_ring_ctx *ctx, unsigned opcode,
                        break;
                ret = io_register_clock(ctx, arg);
                break;
-       case IORING_REGISTER_COPY_BUFFERS:
+       case IORING_REGISTER_CLONE_BUFFERS:
                ret = -EINVAL;
                if (!arg || nr_args != 1)
                        break;
-               ret = io_register_copy_buffers(ctx, arg);
+               ret = io_register_clone_buffers(ctx, arg);
                break;
        default:
                ret = -EINVAL;

diff --git a/io_uring/rsrc.c b/io_uring/rsrc.c
index 40696a395f0afd1668bc6d17001e6535cc971212..9264e555ae59ec2243dd2b6cc90aedd893de5de5 100644 (file)
--- a/io_uring/rsrc.c
+++ b/io_uring/rsrc.c
@@ -1139,7 +1139,7 @@ int io_import_fixed(int ddir, struct iov_iter *iter,
        return 0;
 }
 
-static int io_copy_buffers(struct io_ring_ctx *ctx, struct io_ring_ctx *src_ctx)
+static int io_clone_buffers(struct io_ring_ctx *ctx, struct io_ring_ctx *src_ctx)
 {
        struct io_mapped_ubuf **user_bufs;
        struct io_rsrc_data *data;
@@ -1203,9 +1203,9 @@ out_unlock:
  *
  * Since the memory is already accounted once, don't account it again.
  */
-int io_register_copy_buffers(struct io_ring_ctx *ctx, void __user *arg)
+int io_register_clone_buffers(struct io_ring_ctx *ctx, void __user *arg)
 {
-       struct io_uring_copy_buffers buf;
+       struct io_uring_clone_buffers buf;
        bool registered_src;
        struct file *file;
        int ret;
@@ -1223,7 +1223,7 @@ int io_register_copy_buffers(struct io_ring_ctx *ctx, void __user *arg)
        file = io_uring_register_get_file(buf.src_fd, registered_src);
        if (IS_ERR(file))
                return PTR_ERR(file);
-       ret = io_copy_buffers(ctx, file->private_data);
+       ret = io_clone_buffers(ctx, file->private_data);
        if (!registered_src)
                fput(file);
        return ret;

diff --git a/io_uring/rsrc.h b/io_uring/rsrc.h
index 93546ab337a687118a26f087238e22deefd39d4e..eb4803e473b01302413df546e60f62849eca2c41 100644 (file)
--- a/io_uring/rsrc.h
+++ b/io_uring/rsrc.h
@@ -68,7 +68,7 @@ int io_import_fixed(int ddir, struct iov_iter *iter,
                           struct io_mapped_ubuf *imu,
                           u64 buf_addr, size_t len);
 
-int io_register_copy_buffers(struct io_ring_ctx *ctx, void __user *arg);
+int io_register_clone_buffers(struct io_ring_ctx *ctx, void __user *arg);
 void __io_sqe_buffers_unregister(struct io_ring_ctx *ctx);
 int io_sqe_buffers_unregister(struct io_ring_ctx *ctx);
 int io_sqe_buffers_register(struct io_ring_ctx *ctx, void __user *arg,