diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2020-11-20 17:14:38 -0600 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com> | 2020-12-10 12:42:59 -0600 |
| commit | 8760c909f54a82aaa6e76da19afe798a0c77c3c3 (patch) | |
| tree | 51c7dce9f81841055e70e6c51bc3037aef226f19 /fs/file.c | |
| parent | aa384d10f3d06d4b85597ff5df41551262220e16 (diff) | |
| download | linux-stable-8760c909f54a82aaa6e76da19afe798a0c77c3c3.tar.gz linux-stable-8760c909f54a82aaa6e76da19afe798a0c77c3c3.tar.bz2 linux-stable-8760c909f54a82aaa6e76da19afe798a0c77c3c3.zip | |
file: Rename __close_fd to close_fd and remove the files parameter
The function __close_fd was added to support binder[1]. Now that
binder has been fixed to no longer need __close_fd[2] all calls
to __close_fd pass current->files.
Therefore transform the files parameter into a local variable
initialized to current->files, and rename __close_fd to close_fd to
reflect this change, and keep it in sync with the similar changes to
__alloc_fd, and __fd_install.
This removes the need for callers to care about the extra care that
needs to be take if anything except current->files is passed, by
limiting the callers to only operation on current->files.
[1] 483ce1d4b8c3 ("take descriptor-related part of close() to file.c")
[2] 44d8047f1d87 ("binder: use standard functions to allocate fds")
Acked-by: Christian Brauner <christian.brauner@ubuntu.com>
v1: https://lkml.kernel.org/r/20200817220425.9389-17-ebiederm@xmission.com
Link: https://lkml.kernel.org/r/20201120231441.29911-21-ebiederm@xmission.com
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Diffstat (limited to 'fs/file.c')
| -rw-r--r-- | fs/file.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/fs/file.c b/fs/file.c index 621563701bd9..987ea51630b4 100644 --- a/fs/file.c +++ b/fs/file.c @@ -629,11 +629,9 @@ out_unlock: return file; } -/* - * The same warnings as for __alloc_fd()/__fd_install() apply here... - */ -int __close_fd(struct files_struct *files, unsigned fd) +int close_fd(unsigned fd) { + struct files_struct *files = current->files; struct file *file; file = pick_file(files, fd); @@ -642,7 +640,7 @@ int __close_fd(struct files_struct *files, unsigned fd) return filp_close(file, files); } -EXPORT_SYMBOL(__close_fd); /* for ksys_close() */ +EXPORT_SYMBOL(close_fd); /* for ksys_close() */ /** * __close_range() - Close all file descriptors in a given range. @@ -1027,7 +1025,7 @@ int replace_fd(unsigned fd, struct file *file, unsigned flags) struct files_struct *files = current->files; if (!file) - return __close_fd(files, fd); + return close_fd(fd); if (fd >= rlimit(RLIMIT_NOFILE)) return -EBADF; |