From: Jens Axboe <axboe@kernel.dk>
Date: Mon, 12 Aug 2024 15:25:36 +0000 (-0600)
Subject: io_uring/kbuf: move io_ring_head_to_buf() to kbuf.h
X-Git-Tag: v6.12-rc1~205^2~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2c8fa70bf3e981193ecda0eedf2100f933ef7085;p=thirdparty%2Fkernel%2Flinux.git

io_uring/kbuf: move io_ring_head_to_buf() to kbuf.h

In preparation for using this helper in kbuf.h as well, move it there and
turn it into a macro.

Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/io_uring/kbuf.c b/io_uring/kbuf.c
index c69f698078854..297c1d2c3c277 100644
--- a/io_uring/kbuf.c
+++ b/io_uring/kbuf.c
@@ -132,12 +132,6 @@ static int io_provided_buffers_select(struct io_kiocb *req, size_t *len,
 	return 0;
 }
 
-static struct io_uring_buf *io_ring_head_to_buf(struct io_uring_buf_ring *br,
-						__u16 head, __u16 mask)
-{
-	return &br->bufs[head & mask];
-}
-
 static void __user *io_ring_buffer_select(struct io_kiocb *req, size_t *len,
 					  struct io_buffer_list *bl,
 					  unsigned int issue_flags)
diff --git a/io_uring/kbuf.h b/io_uring/kbuf.h
index 43c7b18244b3c..4c34ff3144b9f 100644
--- a/io_uring/kbuf.h
+++ b/io_uring/kbuf.h
@@ -121,6 +121,9 @@ static inline bool io_kbuf_recycle(struct io_kiocb *req, unsigned issue_flags)
 	return false;
 }
 
+/* Mapped buffer ring, return io_uring_buf from head */
+#define io_ring_head_to_buf(br, head, mask)	&(br)->bufs[(head) & (mask)]
+
 static inline void io_kbuf_commit(struct io_kiocb *req,
 				  struct io_buffer_list *bl, int nr)
 {