diff options
| author | Ming Lei <ming.lei@redhat.com> | 2024-04-07 16:27:59 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2024-04-15 17:10:26 +0300 |
| commit | bbbef3e9d2a82754bd72a86ba1352cfc17bf31a7 (patch) | |
| tree | 6af946d4d61b04c5cae1993cf0778d7f1ea26ed2 /io_uring | |
| parent | c29006a2456bc9c2aea09e4a8958b4d9a7dfcb5a (diff) | |
| download | linux-bbbef3e9d2a82754bd72a86ba1352cfc17bf31a7.tar.xz | |
io_uring: return void from io_put_kbuf_comp()
The only caller doesn't handle the return value of io_put_kbuf_comp(), so
change its return type into void.
Also follow Jens's suggestion to rename it as io_put_kbuf_drop().
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Link: https://lore.kernel.org/r/20240407132759.4056167-1-ming.lei@redhat.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'io_uring')
| -rw-r--r-- | io_uring/io_uring.c | 2 | ||||
| -rw-r--r-- | io_uring/kbuf.h | 8 |
2 files changed, 3 insertions, 7 deletions
diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c index 9d389bd89006..b7984442dd84 100644 --- a/io_uring/io_uring.c +++ b/io_uring/io_uring.c @@ -381,7 +381,7 @@ static void io_clean_op(struct io_kiocb *req) { if (req->flags & REQ_F_BUFFER_SELECTED) { spin_lock(&req->ctx->completion_lock); - io_put_kbuf_comp(req); + io_kbuf_drop(req); spin_unlock(&req->ctx->completion_lock); } diff --git a/io_uring/kbuf.h b/io_uring/kbuf.h index 53c141d9a8b2..5a9635ee0217 100644 --- a/io_uring/kbuf.h +++ b/io_uring/kbuf.h @@ -120,18 +120,14 @@ static inline void __io_put_kbuf_list(struct io_kiocb *req, } } -static inline unsigned int io_put_kbuf_comp(struct io_kiocb *req) +static inline void io_kbuf_drop(struct io_kiocb *req) { - unsigned int ret; - lockdep_assert_held(&req->ctx->completion_lock); if (!(req->flags & (REQ_F_BUFFER_SELECTED|REQ_F_BUFFER_RING))) - return 0; + return; - ret = IORING_CQE_F_BUFFER | (req->buf_index << IORING_CQE_BUFFER_SHIFT); __io_put_kbuf_list(req, &req->ctx->io_buffers_comp); - return ret; } static inline unsigned int io_put_kbuf(struct io_kiocb *req, |