Ksawlii/kernel_samsung_a53x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

file: Rename __close_fd to close_fd and remove the files parameter

Browse source 
[ Upstream commit 8760c909f54a82aaa6e76da19afe798a0c77c3c3 ]

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>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Eric W. Biederman 2020-11-20 17:14:38 -06:00 • committed by Ksawlii
parent 2467279809
commit b0d8979a5d
4 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
fs/file.c
View file

@ -659,11 +659,9 @@ out_unlock:
return file; return file;
} }
/* int close_fd(unsigned fd)
* The same warnings as for __alloc_fd()/__fd_install() apply here...
*/
int __close_fd(struct files_struct *files, unsigned fd)
{ {
struct files_struct *files = current->files;
struct file *file; struct file *file;
file = pick_file(files, fd); file = pick_file(files, fd);
@ -672,7 +670,7 @@ int __close_fd(struct files_struct *files, unsigned fd)
return filp_close(file, files); 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. * __close_range() - Close all file descriptors in a given range.
@ -1087,7 +1085,7 @@ int replace_fd(unsigned fd, struct file *file, unsigned flags)
struct files_struct *files = current->files; struct files_struct *files = current->files;
if (!file) if (!file)
return __close_fd(files, fd); return close_fd(fd);
if (fd >= rlimit(RLIMIT_NOFILE)) if (fd >= rlimit(RLIMIT_NOFILE))
return -EBADF; return -EBADF;

2
fs/open.c
View file

@ -1342,7 +1342,7 @@ EXPORT_SYMBOL(filp_close);
*/ */
SYSCALL_DEFINE1(close, unsigned int, fd) SYSCALL_DEFINE1(close, unsigned int, fd)
{ {
int retval = __close_fd(current->files, fd); int retval = close_fd(fd);
/* can't restart close syscall because file table entry was cleared */ /* can't restart close syscall because file table entry was cleared */
if (unlikely(retval == -ERESTARTSYS || if (unlikely(retval == -ERESTARTSYS ||

3
include/linux/fdtable.h
View file

@ -124,8 +124,7 @@ int iterate_fd(struct files_struct *, unsigned,
int (*)(const void *, struct file *, unsigned), int (*)(const void *, struct file *, unsigned),
const void *); const void *);
extern int __close_fd(struct files_struct *files, extern int close_fd(unsigned int fd);
unsigned int fd);
extern int __close_range(unsigned int fd, unsigned int max_fd, unsigned int flags); 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 int close_fd_get_file(unsigned int fd, struct file **res);
extern int unshare_fd(unsigned long unshare_flags, unsigned int max_fds, extern int unshare_fd(unsigned long unshare_flags, unsigned int max_fds,

6
include/linux/syscalls.h
View file

@ -1321,16 +1321,16 @@ static inline long ksys_ftruncate(unsigned int fd, loff_t length)
return do_sys_ftruncate(fd, length, 1); return do_sys_ftruncate(fd, length, 1);
} }
extern int __close_fd(struct files_struct *files, unsigned int fd); extern int close_fd(unsigned int fd);
/* /*
* In contrast to sys_close(), this stub does not check whether the syscall * In contrast to sys_close(), this stub does not check whether the syscall
* should or should not be restarted, but returns the raw error codes from * should or should not be restarted, but returns the raw error codes from
* __close_fd(). * close_fd().
*/ */
static inline int ksys_close(unsigned int fd) static inline int ksys_close(unsigned int fd)
{ {
return __close_fd(current->files, fd); return close_fd(fd);
} }
extern long do_sys_truncate(const char __user *pathname, loff_t length); extern long do_sys_truncate(const char __user *pathname, loff_t length);