Merge tag 'pull-work.fd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull file descriptor fix from Al Viro:
 "Fix for breakage in #work.fd this window"

* tag 'pull-work.fd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  fix the breakage in close_fd_get_file() calling conventions change

diff --cc drivers/android/binder.c
Simple merge

diff --cc fs/io_uring.c
index 86f9df56526b2d13060f43eff1dd74d7635b4114,33da5116cc38ca4062750f52bf2843749e152ade..3aab4182fd892173e16b900fa437d47094195db0
--- 1/fs/io_uring.c
--- 2/fs/io_uring.c
+++ b/fs/io_uring.c
@@@ -6025,11 -5124,9 +6025,10 @@@ static int io_close(struct io_kiocb *re
                spin_unlock(&files->file_lock);
                goto err;
        }
 -      file = fdt->fd[close->fd];
 +      file = rcu_dereference_protected(fdt->fd[close->fd],
 +                      lockdep_is_held(&files->file_lock));
        if (!file || file->f_op == &io_uring_fops) {
                spin_unlock(&files->file_lock);
-               file = NULL;
                goto err;
        }