Change 'gid' to 'bgid' for providing buffers
This makes it clear it's a buffer group ID, and not some variant of
a credential related group ID.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
diff --git a/src/include/liburing.h b/src/include/liburing.h
index 7b427f6..6285c4d 100644
--- a/src/include/liburing.h
+++ b/src/include/liburing.h
@@ -412,10 +412,10 @@
static inline void io_uring_prep_provide_buffers(struct io_uring_sqe *sqe,
void *addr, int len, int nr,
- int gid, int bid)
+ int bgid, int bid)
{
io_uring_prep_rw(IORING_OP_PROVIDE_BUFFERS, sqe, nr, addr, len, bid);
- sqe->buf_group = gid;
+ sqe->buf_group = bgid;
}
static inline void io_uring_prep_remove_buffers(struct io_uring_sqe *sqe,
diff --git a/test/send_recvmsg.c b/test/send_recvmsg.c
index f28f737..ce08ff1 100644
--- a/test/send_recvmsg.c
+++ b/test/send_recvmsg.c
@@ -21,10 +21,10 @@
#define PORT 10200
#define HOST "127.0.0.1"
-#define BUF_GID 10
+#define BUF_BGID 10
#define BUF_BID 89
-static int recv_prep(struct io_uring *ring, struct iovec *iov, int gid)
+static int recv_prep(struct io_uring *ring, struct iovec *iov, int bgid)
{
struct sockaddr_in saddr;
struct msghdr msg;
@@ -60,11 +60,11 @@
sqe = io_uring_get_sqe(ring);
io_uring_prep_recvmsg(sqe, sockfd, &msg, 0);
- if (gid) {
+ if (bgid) {
sqe->user_data = (unsigned long) iov->iov_base;
iov->iov_base = NULL;
sqe->flags |= IOSQE_BUFFER_SELECT;
- sqe->buf_group = gid;
+ sqe->buf_group = bgid;
}
ret = io_uring_submit(ring);
@@ -150,7 +150,7 @@
if (rd->buf_select && !rd->no_buf_add) {
sqe = io_uring_get_sqe(&ring);
io_uring_prep_provide_buffers(sqe, buf, sizeof(buf) -1, 1,
- BUF_GID, BUF_BID);
+ BUF_BGID, BUF_BID);
ret = io_uring_submit(&ring);
if (ret != 1) {
fprintf(stderr, "submit ret=%d\n", ret);
@@ -170,7 +170,7 @@
}
}
- ret = recv_prep(&ring, &iov, rd->buf_select ? BUF_GID : 0);
+ ret = recv_prep(&ring, &iov, rd->buf_select ? BUF_BGID : 0);
if (ret) {
fprintf(stderr, "recv_prep failed: %d\n", ret);
goto err;