diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-06-04 18:52:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-06-04 18:52:00 -0700 |
| commit | dbe0ee46614016146c1b3e1fc063b44333bb2401 (patch) | |
| tree | d575d487d306a8f03cceac3f930d7fd53a6079f8 /drivers/android | |
| parent | d66016c5cd3d4c474cd24622c511dcd358645613 (diff) | |
| parent | 6319194ec57b0452dcda4589d24c4e7db299c5bf (diff) | |
Merge tag 'pull-18-rc1-work.fd' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'drivers/android')
| -rw-r--r-- | drivers/android/binder.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/android/binder.c b/drivers/android/binder.c index 77d0b17cb646..9e0982289dde 100644 --- a/drivers/android/binder.c +++ b/drivers/android/binder.c @@ -1884,7 +1884,7 @@ static void binder_deferred_fd_close(int fd) if (!twcb) return; init_task_work(&twcb->twork, binder_do_fd_close); - close_fd_get_file(fd, &twcb->file); + twcb->file = close_fd_get_file(fd); if (twcb->file) { filp_close(twcb->file, current->files); task_work_add(current, &twcb->twork, TWA_RESUME); |