diff options
| author | Jens Axboe <axboe@kernel.dk> | 2024-08-12 09:25:36 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2024-08-29 08:44:42 -0600 |
| commit | 2c8fa70bf3e981193ecda0eedf2100f933ef7085 (patch) | |
| tree | 7885bd00d47328f81951f225eed52bd596f78a4a | |
| parent | ecd5c9b29643f383d39320e30d21b8615bd893da (diff) | |
| download | lwn-2c8fa70bf3e981193ecda0eedf2100f933ef7085.tar.gz lwn-2c8fa70bf3e981193ecda0eedf2100f933ef7085.zip | |
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>
| -rw-r--r-- | io_uring/kbuf.c | 6 | ||||
| -rw-r--r-- | io_uring/kbuf.h | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/io_uring/kbuf.c b/io_uring/kbuf.c index c69f69807885..297c1d2c3c27 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 43c7b18244b3..4c34ff3144b9 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) { |