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

Revert "file: Rename __close_fd to close_fd and remove the files parameter"

Browse source 
This reverts commit b0d8979a5d.
This commit is contained in:
Ksawlii 2024-11-19 12:59:13 +01:00
parent eef404784c
commit f7566e9585
4 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
fs/file.c
View file

@ -659,9 +659,11 @@ out_unlock:
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;
file = pick_file(files, fd);
@ -670,7 +672,7 @@ int close_fd(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.
@ -1085,7 +1087,7 @@ int replace_fd(unsigned fd, struct file *file, unsigned flags)
struct files_struct *files = current->files;
if (!file)
return close_fd(fd);
return __close_fd(files, fd);
if (fd >= rlimit(RLIMIT_NOFILE))
return -EBADF;

2
fs/open.c
View file

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

3
include/linux/fdtable.h
View file

@ -124,7 +124,8 @@ int iterate_fd(struct files_struct *, unsigned,
int (*)(const void *, struct file *, unsigned),
const void *);
extern int close_fd(unsigned int fd);
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);
extern int close_fd_get_file(unsigned int fd, struct file **res);
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);
}
extern int close_fd(unsigned int fd);
extern int __close_fd(struct files_struct *files, unsigned int fd);
/*
* 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
* close_fd().
* __close_fd().
*/
static inline int ksys_close(unsigned int fd)
{
return close_fd(fd);
return __close_fd(current->files, fd);
}
extern long do_sys_truncate(const char __user *pathname, loff_t length);