From cb1717a7cd0fc8a063bd7fe3b4eb6fd81defb11c Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Mon, 28 Oct 2024 08:35:05 -0600 Subject: [PATCH] io_uring/filetable: remove io_file_from_index() helper It's only used in fdinfo, nothing really gained from having this helper. Signed-off-by: Jens Axboe --- io_uring/fdinfo.c | 4 +++- io_uring/filetable.h | 10 ---------- 2 files changed, 3 insertions(+), 11 deletions(-) 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 29edda0caa65..6c0c9642f6e9 100644 --- a/io_uring/filetable.h +++ b/io_uring/filetable.h @@ -49,16 +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 = 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) {