[12/13] io_uring/filetable: remove io_file_from_index() helper

Commit Message

Jens Axboe Oct. 28, 2024, 2:52 p.m. UTC

It's only used in fdinfo, nothing really gained from having this helper.

Signed-off-by: Jens Axboe <[e-mail]>
---
 io_uring/fdinfo.c    |  4 +++-
 io_uring/filetable.h | 11 -----------
 2 files changed, 3 insertions(+), 12 deletions(-)

Patch

diff --git a/io_uring/fdinfo.c b/io_uring/fdinfo.c
index e3f5e9fe5562..9d96481e2eb6 100644
--- a/io_uring/fdinfo.c
+++ b/io_uring/fdinfo.c
@@ -167,8 +167,10 @@  __cold void io_uring_show_fdinfo(struct seq_file *m, struct file *file)
 	seq_printf(m, "SqWorkTime:\t%llu\n", sq_work_time);
 	seq_printf(m, "UserFiles:\t%u\n", ctx->file_table.data.nr);
 	for (i = 0; has_lock && i < ctx->file_table.data.nr; i++) {
-		struct file *f = io_file_from_index(&ctx->file_table, i);
+		struct file *f = NULL;
 
+		if (ctx->file_table.data.nodes[i])
+			f = io_slot_file(ctx->file_table.data.nodes[i]);
 		if (f)
 			seq_printf(m, "%5u: %s\n", i, file_dentry(f)->d_iname);
 		else
diff --git a/io_uring/filetable.h b/io_uring/filetable.h
index f68ffc24061c..782d28d66245 100644
--- a/io_uring/filetable.h
+++ b/io_uring/filetable.h
@@ -49,17 +49,6 @@  static inline struct file *io_slot_file(struct io_rsrc_node *node)
 	return (struct file *)(node->file_ptr & FFS_MASK);
 }
 
-static inline struct file *io_file_from_index(struct io_file_table *table,
-					      int index)
-{
-	struct io_rsrc_node *node;
-
-	node = io_rsrc_node_lookup(&table->data, &index);
-	if (node)
-		return io_slot_file(node);
-	return NULL;
-}
-
 static inline void io_fixed_file_set(struct io_rsrc_node *node,
 				     struct file *file)
 {