diff options
-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, |