mirror of
https://github.com/torvalds/linux
synced 2024-09-06 01:40:28 +00:00
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>
This commit is contained in:
parent
c29006a245
commit
bbbef3e9d2
|
@ -381,7 +381,7 @@ static void io_clean_op(struct io_kiocb *req)
|
||||||
{
|
{
|
||||||
if (req->flags & REQ_F_BUFFER_SELECTED) {
|
if (req->flags & REQ_F_BUFFER_SELECTED) {
|
||||||
spin_lock(&req->ctx->completion_lock);
|
spin_lock(&req->ctx->completion_lock);
|
||||||
io_put_kbuf_comp(req);
|
io_kbuf_drop(req);
|
||||||
spin_unlock(&req->ctx->completion_lock);
|
spin_unlock(&req->ctx->completion_lock);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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);
|
lockdep_assert_held(&req->ctx->completion_lock);
|
||||||
|
|
||||||
if (!(req->flags & (REQ_F_BUFFER_SELECTED|REQ_F_BUFFER_RING)))
|
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);
|
__io_put_kbuf_list(req, &req->ctx->io_buffers_comp);
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline unsigned int io_put_kbuf(struct io_kiocb *req,
|
static inline unsigned int io_put_kbuf(struct io_kiocb *req,
|
||||||
|
|
Loading…
Reference in a new issue