summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2020-11-21 02:14:35 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-06-21 15:52:49 +0300
commit89f9e529643ab5b1a98b98e30ac4177d0f7ba1cc (patch)
tree61ba71639cac4de7654af9d723b66129a9f699ae /include/linux
parentb4b827da9096162b3cd4e3d7cee6da087c47e6f0 (diff)
downloadlinux-89f9e529643ab5b1a98b98e30ac4177d0f7ba1cc.tar.xz
file: Merge __fd_install into fd_install
[ Upstream commit d74ba04d919ebe30bf47406819c18c6b50003d92 ] The function __fd_install was added to support binder[1]. With binder fixed[2] there are no more users. As fd_install just calls __fd_install with "files=current->files", merge them together by transforming the files parameter into a local variable initialized to current->files. [1] f869e8a7f753 ("expose a low-level variant of fd_install() for binder") [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-14-ebiederm@xmission.com Link: https://lkml.kernel.org/r/20201120231441.29911-18-ebiederm@xmission.com Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/fdtable.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/fdtable.h b/include/linux/fdtable.h
index b0c6a959c6a0..6e8743a4c9d3 100644
--- a/include/linux/fdtable.h
+++ b/include/linux/fdtable.h
@@ -126,8 +126,6 @@ int iterate_fd(struct files_struct *, unsigned,
extern int __alloc_fd(struct files_struct *files,
unsigned start, unsigned end, unsigned flags);
-extern void __fd_install(struct files_struct *files,
- unsigned int fd, struct file *file);
extern int __close_fd(struct files_struct *files,
unsigned int fd);
extern int __close_range(unsigned int fd, unsigned int max_fd, unsigned int flags);