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 /include/linux/fdtable.h | |
| parent | d66016c5cd3d4c474cd24622c511dcd358645613 (diff) | |
| parent | 6319194ec57b0452dcda4589d24c4e7db299c5bf (diff) | |
| download | linux-stable-dbe0ee46614016146c1b3e1fc063b44333bb2401.tar.gz linux-stable-dbe0ee46614016146c1b3e1fc063b44333bb2401.tar.bz2 linux-stable-dbe0ee46614016146c1b3e1fc063b44333bb2401.zip | |
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 'include/linux/fdtable.h')
| -rw-r--r-- | include/linux/fdtable.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/fdtable.h b/include/linux/fdtable.h index d0e78174874a..e066816f3519 100644 --- a/include/linux/fdtable.h +++ b/include/linux/fdtable.h @@ -125,7 +125,7 @@ int iterate_fd(struct files_struct *, unsigned, extern int close_fd(unsigned int fd); extern int __close_range(unsigned int fd, unsigned int max_fd, unsigned int flags); -extern int close_fd_get_file(unsigned int fd, struct file **res); +extern struct file *close_fd_get_file(unsigned int fd); extern int unshare_fd(unsigned long unshare_flags, unsigned int max_fds, struct files_struct **new_fdp); |