io_uring: remove FFS_SCM

[linux-block.git] / io_uring / rsrc.c

diff --git a/io_uring/rsrc.c b/io_uring/rsrc.c
index 012fdb04ec238ee4e6649b0e25485a9d49d32b4e..55d4ab96fb9255706d915c1c0cc2bdcf2abd9999 100644 (file)
--- a/io_uring/rsrc.c
+++ b/io_uring/rsrc.c
@@ -757,20 +757,17 @@ int io_queue_rsrc_removal(struct io_rsrc_data *data, unsigned idx,
 
 void __io_sqe_files_unregister(struct io_ring_ctx *ctx)
 {
-#if !defined(IO_URING_SCM_ALL)
        int i;
 
        for (i = 0; i < ctx->nr_user_files; i++) {
                struct file *file = io_file_from_index(&ctx->file_table, i);
 
-               if (!file)
-                       continue;
-               if (io_fixed_file_slot(&ctx->file_table, i)->file_ptr & FFS_SCM)
+               /* skip scm accounted files, they'll be freed by ->ring_sock */
+               if (!file || io_file_need_scm(file))
                        continue;
                io_file_bitmap_clear(&ctx->file_table, i);
                fput(file);
        }
-#endif
 
 #if defined(CONFIG_UNIX)
        if (ctx->ring_sock) {