Skip to content

Commit ebae09b

Browse files
isilenceaxboe
authored andcommitted
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>
1 parent 825f276 commit ebae09b

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

io_uring/zcrx.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -384,11 +384,11 @@ static int io_allocate_rbuf_ring(struct io_ring_ctx *ctx,
384384
mmap_offset = IORING_MAP_OFF_ZCRX_REGION;
385385
mmap_offset += id << IORING_OFF_PBUF_SHIFT;
386386

387-
ret = io_create_region(ctx, &ifq->region, rd, mmap_offset);
387+
ret = io_create_region(ctx, &ifq->rq_region, rd, mmap_offset);
388388
if (ret < 0)
389389
return ret;
390390

391-
ptr = io_region_get_ptr(&ifq->region);
391+
ptr = io_region_get_ptr(&ifq->rq_region);
392392
ifq->rq_ring = (struct io_uring *)ptr;
393393
ifq->rqes = (struct io_uring_zcrx_rqe *)(ptr + off);
394394

@@ -397,7 +397,7 @@ static int io_allocate_rbuf_ring(struct io_ring_ctx *ctx,
397397

398398
static void io_free_rbuf_ring(struct io_zcrx_ifq *ifq)
399399
{
400-
io_free_region(ifq->user, &ifq->region);
400+
io_free_region(ifq->user, &ifq->rq_region);
401401
ifq->rq_ring = NULL;
402402
ifq->rqes = NULL;
403403
}
@@ -645,7 +645,7 @@ struct io_mapped_region *io_zcrx_get_region(struct io_ring_ctx *ctx,
645645

646646
lockdep_assert_held(&ctx->mmap_lock);
647647

648-
return ifq ? &ifq->region : NULL;
648+
return ifq ? &ifq->rq_region : NULL;
649649
}
650650

651651
static int zcrx_box_release(struct inode *inode, struct file *file)

io_uring/zcrx.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ struct io_zcrx_ifq {
6666
* net stack.
6767
*/
6868
struct mutex pp_lock;
69-
struct io_mapped_region region;
69+
struct io_mapped_region rq_region;
7070
};
7171

7272
#if defined(CONFIG_IO_URING_ZCRX)

0 commit comments

Comments
 (0)