Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 14:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

fs: add ksys_getdents64() helper; remove in-kernel calls to sys_getdents64()

Browse Source 
Using this helper allows us to avoid the in-kernel calls to the
sys_getdents64() syscall. The ksys_ prefix denotes that this function
is meant as a drop-in replacement for the syscall. In particular, it
uses the same calling convention as sys_getdents64().

This patch is part of a series which removes in-kernel calls to syscalls.
On this basis, the syscall entry path can be streamlined. For details, see
http://lkml.kernel.org/r/20180325162527.GA17492@light.dominikbrodowski.net

Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
This commit is contained in:
Dominik Brodowski 2018-03-13 21:34:04 +01:00
parent bae217ea8c
commit 454dab3f96
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fs/readdir.c
View File

@ -292,8 +292,8 @@ efault:
return -EFAULT; return -EFAULT;
} }
SYSCALL_DEFINE3(getdents64, unsigned int, fd, int ksys_getdents64(unsigned int fd, struct linux_dirent64 __user *dirent,
struct linux_dirent64 __user *, dirent, unsigned int, count) unsigned int count)
{ {
struct fd f; struct fd f;
struct linux_dirent64 __user * lastdirent; struct linux_dirent64 __user * lastdirent;
@ -326,6 +326,13 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
return error; return error;
} }
SYSCALL_DEFINE3(getdents64, unsigned int, fd,
struct linux_dirent64 __user *, dirent, unsigned int, count)
{
return ksys_getdents64(fd, dirent, count);
}
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
struct compat_old_linux_dirent { struct compat_old_linux_dirent {
compat_ulong_t d_ino; compat_ulong_t d_ino;

2
include/linux/syscalls.h
View File

@ -955,6 +955,8 @@ ssize_t ksys_write(unsigned int fd, const char __user *buf, size_t count);
int ksys_chdir(const char __user *filename); int ksys_chdir(const char __user *filename);
int ksys_fchmod(unsigned int fd, umode_t mode); int ksys_fchmod(unsigned int fd, umode_t mode);
int ksys_fchown(unsigned int fd, uid_t user, gid_t group); int ksys_fchown(unsigned int fd, uid_t user, gid_t group);
int ksys_getdents64(unsigned int fd, struct linux_dirent64 __user *dirent,
unsigned int count);
/* /*
* The following kernel syscall equivalents are just wrappers to fs-internal * The following kernel syscall equivalents are just wrappers to fs-internal

4
init/initramfs.c
View File

@ -579,7 +579,7 @@ static void __init clean_rootfs(void)
} }
dirp = buf; dirp = buf;
num = sys_getdents64(fd, dirp, BUF_SIZE); num = ksys_getdents64(fd, dirp, BUF_SIZE);
while (num > 0) { while (num > 0) {
while (num > 0) { while (num > 0) {
struct kstat st; struct kstat st;
@ -599,7 +599,7 @@ static void __init clean_rootfs(void)
} }
dirp = buf; dirp = buf;
memset(buf, 0, BUF_SIZE); memset(buf, 0, BUF_SIZE);
num = sys_getdents64(fd, dirp, BUF_SIZE); num = ksys_getdents64(fd, dirp, BUF_SIZE);
} }
ksys_close(fd); ksys_close(fd);