io_uring/zcrx: use better name for RQ region

Rename "region" to "rq_region" to highlight that it's a refill queue
region.

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

diff --git a/io_uring/zcrx.c b/io_uring/zcrx.c
index c753f88b6575230c30465de88715c8392893f29d..e58087073cd58a359100928bb4ffc6aa3baac698 100644 (file)
--- a/io_uring/zcrx.c
+++ b/io_uring/zcrx.c
@@ -384,11 +384,11 @@ static int io_allocate_rbuf_ring(struct io_ring_ctx *ctx,
        mmap_offset = IORING_MAP_OFF_ZCRX_REGION;
        mmap_offset += id << IORING_OFF_PBUF_SHIFT;
 
-       ret = io_create_region(ctx, &ifq->region, rd, mmap_offset);
+       ret = io_create_region(ctx, &ifq->rq_region, rd, mmap_offset);
        if (ret < 0)
                return ret;
 
-       ptr = io_region_get_ptr(&ifq->region);
+       ptr = io_region_get_ptr(&ifq->rq_region);
        ifq->rq_ring = (struct io_uring *)ptr;
        ifq->rqes = (struct io_uring_zcrx_rqe *)(ptr + off);
 
@@ -397,7 +397,7 @@ static int io_allocate_rbuf_ring(struct io_ring_ctx *ctx,
 
 static void io_free_rbuf_ring(struct io_zcrx_ifq *ifq)
 {
-       io_free_region(ifq->user, &ifq->region);
+       io_free_region(ifq->user, &ifq->rq_region);
        ifq->rq_ring = NULL;
        ifq->rqes = NULL;
 }
@@ -645,7 +645,7 @@ struct io_mapped_region *io_zcrx_get_region(struct io_ring_ctx *ctx,
 
        lockdep_assert_held(&ctx->mmap_lock);
 
-       return ifq ? &ifq->region : NULL;
+       return ifq ? &ifq->rq_region : NULL;
 }
 
 static int zcrx_box_release(struct inode *inode, struct file *file)

diff --git a/io_uring/zcrx.h b/io_uring/zcrx.h
index f395656c3160847fd4d9c4d68850f030f4854921..3b2681a1fafd95e3cb8a7d7e0567a673895d25aa 100644 (file)
--- a/io_uring/zcrx.h
+++ b/io_uring/zcrx.h
@@ -66,7 +66,7 @@ struct io_zcrx_ifq {
         * net stack.
         */
        struct mutex                    pp_lock;
-       struct io_mapped_region         region;
+       struct io_mapped_region         rq_region;
 };
 
 #if defined(CONFIG_IO_URING_ZCRX)