diff mbox series

[1/2,5.9,backport] io_uring: get an active ref_node from files_data

Message ID 075a6b4e7a9235d13b08b1f13f461846fbb97673.1606170275.git.asml.silence@gmail.com
State New
Headers show
Series [1/2,5.9,backport] io_uring: get an active ref_node from files_data | expand

Commit Message

Pavel Begunkov Nov. 23, 2020, 10:34 p.m. UTC 
commit 1e5d770bb8a23dd01e28e92f4fb0b1093c8bdbe6 upstream

An active ref_node always can be found in ctx->files_data, it's much
safer to get it this way instead of poking into files_data->ref_list.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Cc: stable@vger.kernel.org # v5.7+
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---
 fs/io_uring.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Comments

Greg KH Nov. 24, 2020, 4:50 p.m. UTC | #1 
On Mon, Nov 23, 2020 at 10:34:06PM +0000, Pavel Begunkov wrote:
> commit 1e5d770bb8a23dd01e28e92f4fb0b1093c8bdbe6 upstream

> 

> An active ref_node always can be found in ctx->files_data, it's much

> safer to get it this way instead of poking into files_data->ref_list.

> 

> Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>

> Cc: stable@vger.kernel.org # v5.7+

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

> ---

>  fs/io_uring.c | 5 ++---

>  1 file changed, 2 insertions(+), 3 deletions(-)


Both patches now queued up, thanks.

greg k-h
diff mbox series

Patch

diff --git a/fs/io_uring.c b/fs/io_uring.c
index 352bd3ad446b..24c0ad17ec4c 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -6855,9 +6855,8 @@  static int io_sqe_files_unregister(struct io_ring_ctx *ctx)
 		return -ENXIO;
 
 	spin_lock(&data->lock);
-	if (!list_empty(&data->ref_list))
-		ref_node = list_first_entry(&data->ref_list,
-				struct fixed_file_ref_node, node);
+	ref_node = container_of(data->cur_refs, struct fixed_file_ref_node,
+				refs);
 	spin_unlock(&data->lock);
 	if (ref_node)
 		percpu_ref_kill(&ref_node->refs);