diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-21 23:11:44 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-21 23:11:44 +0300 |
| commit | b6394d6f715919c053c1450ef0d7c5e517b53764 (patch) | |
| tree | 4aa911757dd8ef6949fcb79daaaae3aa87d709e6 /fs/proc | |
| parent | 3413efa8885d7a714c54c6752eaf49fd17d351c9 (diff) | |
| parent | 7c98f7cb8fda964fbc60b9307ad35e94735fa35f (diff) | |
| download | linux-b6394d6f715919c053c1450ef0d7c5e517b53764.tar.xz | |
Merge tag 'pull-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull misc vfs updates from Al Viro:
"Assorted commits that had missed the last merge window..."
* tag 'pull-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
remove call_{read,write}_iter() functions
do_dentry_open(): kill inode argument
kernel_file_open(): get rid of inode argument
get_file_rcu(): no need to check for NULL separately
fd_is_open(): move to fs/file.c
close_on_exec(): pass files_struct instead of fdtable
Diffstat (limited to 'fs/proc')
| -rw-r--r-- | fs/proc/fd.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/proc/fd.c b/fs/proc/fd.c index f4b1c8b42a51..586bbc84ca04 100644 --- a/fs/proc/fd.c +++ b/fs/proc/fd.c @@ -39,10 +39,8 @@ static int seq_show(struct seq_file *m, void *v) spin_lock(&files->file_lock); file = files_lookup_fd_locked(files, fd); if (file) { - struct fdtable *fdt = files_fdtable(files); - f_flags = file->f_flags; - if (close_on_exec(fd, fdt)) + if (close_on_exec(fd, files)) f_flags |= O_CLOEXEC; get_file(file); |