Use the more generic name io_unregister_buf_ring() as this function will be used for unregistering both provided buffer rings and kernel-managed buffer rings. This is a preparatory change for upcoming kernel-managed buffer ring support. Signed-off-by: Joanne Koong --- io_uring/kbuf.c | 2 +- io_uring/kbuf.h | 2 +- io_uring/register.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/io_uring/kbuf.c b/io_uring/kbuf.c index 100367bb510b..cbe477db7b86 100644 --- a/io_uring/kbuf.c +++ b/io_uring/kbuf.c @@ -718,7 +718,7 @@ int io_register_pbuf_ring(struct io_ring_ctx *ctx, void __user *arg) return 0; } -int io_unregister_pbuf_ring(struct io_ring_ctx *ctx, void __user *arg) +int io_unregister_buf_ring(struct io_ring_ctx *ctx, void __user *arg) { struct io_uring_buf_reg reg; struct io_buffer_list *bl; diff --git a/io_uring/kbuf.h b/io_uring/kbuf.h index bf15e26520d3..40b44f4fdb15 100644 --- a/io_uring/kbuf.h +++ b/io_uring/kbuf.h @@ -74,7 +74,7 @@ int io_provide_buffers_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe int io_manage_buffers_legacy(struct io_kiocb *req, unsigned int issue_flags); int io_register_pbuf_ring(struct io_ring_ctx *ctx, void __user *arg); -int io_unregister_pbuf_ring(struct io_ring_ctx *ctx, void __user *arg); +int io_unregister_buf_ring(struct io_ring_ctx *ctx, void __user *arg); int io_register_pbuf_status(struct io_ring_ctx *ctx, void __user *arg); bool io_kbuf_recycle_legacy(struct io_kiocb *req, unsigned issue_flags); diff --git a/io_uring/register.c b/io_uring/register.c index 62d39b3ff317..4c6879698844 100644 --- a/io_uring/register.c +++ b/io_uring/register.c @@ -750,7 +750,7 @@ static int __io_uring_register(struct io_ring_ctx *ctx, unsigned opcode, ret = -EINVAL; if (!arg || nr_args != 1) break; - ret = io_unregister_pbuf_ring(ctx, arg); + ret = io_unregister_buf_ring(ctx, arg); break; case IORING_REGISTER_SYNC_CANCEL: ret = -EINVAL; -- 2.47.3