Merge tag 'pull-18-rc1-work.fd' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 5 Jun 2022 01:52:00 +0000 (18:52 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 5 Jun 2022 01:52:00 +0000 (18:52 -0700)
Pull file descriptor updates from Al Viro.

 - Descriptor handling cleanups

* tag 'pull-18-rc1-work.fd' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  Unify the primitives for file descriptor closing
  fs: remove fget_many and fput_many interface
  io_uring_enter(): don't leave f.flags uninitialized

1  2 
drivers/android/binder.c
fs/file_table.c
fs/internal.h
fs/io_uring.c
include/linux/fs.h

Simple merge
diff --cc fs/file_table.c
Simple merge
diff --cc fs/internal.h
Simple merge
diff --cc fs/io_uring.c
@@@ -12158,9 -11038,8 +12155,8 @@@ iopoll_locked
  out:
        percpu_ref_put(&ctx->refs);
  out_fput:
-       if (!(flags & IORING_ENTER_REGISTERED_RING))
-               fdput(f);
+       fdput(f);
 -      return submitted ? submitted : ret;
 +      return ret;
  }
  
  #ifdef CONFIG_PROC_FS
Simple merge