Commit df260e21 authored by Dominik Brodowski's avatar Dominik Brodowski
Browse files

fs: add ksys_truncate() wrapper; remove in-kernel calls to sys_truncate() 

Using the ksys_truncate() wrapper allows us to get rid of in-kernel
calls to the sys_truncate() 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_truncate().

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: Al Viro <viro@zeniv.linux.org.uk>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent 806cbae1

arch/mips/kernel/linux32.c

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ struct rlimit32 { 
SYSCALL_DEFINE4(32_truncate64, const char __user *, path,

	unsigned long, __dummy, unsigned long, a2, unsigned long, a3)

{

	return sys_truncate(path, merge_64(a2, a3));

	return ksys_truncate(path, merge_64(a2, a3));

}



SYSCALL_DEFINE4(32_ftruncate64, unsigned long, fd, unsigned long, __dummy,

arch/parisc/kernel/sys_parisc.c

+3 −3
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ asmlinkage unsigned long sys_mmap(unsigned long addr, unsigned long len, 
asmlinkage long parisc_truncate64(const char __user * path,

					unsigned int high, unsigned int low)

{

	return sys_truncate(path, (long)high << 32 | low);

	return ksys_truncate(path, (long)high << 32 | low);

}



asmlinkage long parisc_ftruncate64(unsigned int fd,
@@ -305,7 +305,7 @@ asmlinkage long parisc_ftruncate64(unsigned int fd, 
 * are identical on LP64 */

asmlinkage long sys_truncate64(const char __user * path, unsigned long length)

{

	return sys_truncate(path, length);

	return ksys_truncate(path, length);

}

asmlinkage long sys_ftruncate64(unsigned int fd, unsigned long length)

{
@@ -320,7 +320,7 @@ asmlinkage long sys_fcntl64(unsigned int fd, unsigned int cmd, unsigned long arg 
asmlinkage long parisc_truncate64(const char __user * path,

					unsigned int high, unsigned int low)

{

	return sys_truncate64(path, (loff_t)high << 32 | low);

	return ksys_truncate(path, (loff_t)high << 32 | low);

}



asmlinkage long parisc_ftruncate64(unsigned int fd,

arch/powerpc/kernel/sys_ppc32.c

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ compat_ssize_t compat_sys_readahead(int fd, u32 r4, u32 offhi, u32 offlo, u32 co 
asmlinkage int compat_sys_truncate64(const char __user * path, u32 reg4,

				unsigned long high, unsigned long low)

{

	return sys_truncate(path, (high << 32) | low);

	return ksys_truncate(path, (high << 32) | low);

}



asmlinkage long compat_sys_fallocate(int fd, int mode, u32 offhi, u32 offlo,

arch/s390/kernel/compat_linux.c

+1 −1
Original line number Diff line number Diff line
@@ -302,7 +302,7 @@ COMPAT_SYSCALL_DEFINE5(s390_ipc, uint, call, int, first, compat_ulong_t, second, 


COMPAT_SYSCALL_DEFINE3(s390_truncate64, const char __user *, path, u32, high, u32, low)

{

	return sys_truncate(path, (unsigned long)high << 32 | low);

	return ksys_truncate(path, (unsigned long)high << 32 | low);

}



COMPAT_SYSCALL_DEFINE3(s390_ftruncate64, unsigned int, fd, u32, high, u32, low)

arch/sparc/kernel/sys_sparc32.c

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ asmlinkage long sys32_truncate64(const char __user * path, unsigned long high, u 
	if ((int)high < 0)

		return -EINVAL;

	else

		return sys_truncate(path, (high << 32) | low);

		return ksys_truncate(path, (high << 32) | low);

}



asmlinkage long sys32_ftruncate64(unsigned int fd, unsigned long high, unsigned long low)

CRA Git | Maintained and supported by SUSTech CRA and CCSE