From: Jens Axboe <axboe@kernel.dk>
Date: Thu, 8 Aug 2024 16:33:16 +0000 (-0600)
Subject: io_uring/kbuf: use 'bl' directly rather than req->buf_list
X-Git-Tag: v6.12-rc1~205^2~30
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=03e02e8f95fee0f45124976993ed2121e2369a12;p=thirdparty%2Fkernel%2Flinux.git

io_uring/kbuf: use 'bl' directly rather than req->buf_list

req->buf_list is assigned higher up and is safe to use as we remain
within a locked region, as is the 'bl' variable itself from which it
was assigned. To improve readability, use 'bl' directly rather than
get it from the io_kiocb, if we need to increment the head directly
in the buffer selection path. This makes it readily apparent that
it's the same io_buffer_list being used.

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

diff --git a/io_uring/kbuf.c b/io_uring/kbuf.c
index 1af2bd56af44a..c61dd60113f7e 100644
--- a/io_uring/kbuf.c
+++ b/io_uring/kbuf.c
@@ -298,7 +298,7 @@ int io_buffers_select(struct io_kiocb *req, struct buf_sel_arg *arg,
 		 */
 		if (ret > 0) {
 			req->flags |= REQ_F_BL_NO_RECYCLE;
-			req->buf_list->head += ret;
+			bl->head += ret;
 		}
 	} else {
 		ret = io_provided_buffers_select(req, &arg->out_len, bl, arg->iovs);