diff options
| author |  Al Viro <viro@zeniv.linux.org.uk>
| 2024-01-04 21:35:38 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk>
| 2024-04-15 16:03:24 -0400 |
| commit | f60d374d2cc88034385265d193a38e3f4a4b430c (patch) | |
| tree | 24d9d1dbc2ccc55f62dc86d918130e7e4d8423fb /fs | |
| parent | Linux 6.9-rc2 (diff) | |
| download | linux-f60d374d2cc88034385265d193a38e3f4a4b430c.tar.gz linux-f60d374d2cc88034385265d193a38e3f4a4b430c.tar.bz2 linux-f60d374d2cc88034385265d193a38e3f4a4b430c.zip | |
close_on_exec(): pass files_struct instead of fdtable
both callers are happier that way...
Reviewed-by: Christian Brauner <brauner@kernel.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/file.c | 5 | ||||
| -rw-r--r-- | fs/proc/fd.c | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/fs/file.c b/fs/file.c index 3b683b9101d8..eff5ce79f66a 100644 --- a/fs/file.c +++ b/fs/file.c @@ -1219,12 +1219,9 @@ void set_close_on_exec(unsigned int fd, int flag) bool get_close_on_exec(unsigned int fd) { - struct files_struct *files = current->files; - struct fdtable *fdt; bool res; rcu_read_lock(); - fdt = files_fdtable(files); - res = close_on_exec(fd, fdt); + res = close_on_exec(fd, current->files); rcu_read_unlock(); return res; } diff --git a/fs/proc/fd.c b/fs/proc/fd.c index 6e72e5ad42bc..0139aae19651 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); |