From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 5 Jun 2022 01:52:00 +0000 (-0700)
Subject: Merge tag 'pull-18-rc1-work.fd' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.19-rc1~20
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=dbe0ee46614016146c1b3e1fc063b44333bb2401;p=linux-2.6-block.git

Merge tag 'pull-18-rc1-work.fd' of git://git./linux/kernel/git/viro/vfs

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
---

dbe0ee46614016146c1b3e1fc063b44333bb2401
diff --cc fs/io_uring.c
index 2a9b9a24fc22,7257b0870353..86f9df56526b
--- a/fs/io_uring.c
+++ b/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