Commit 411d9475 authored by Dominik Brodowski's avatar Dominik Brodowski
Browse files

fs: add ksys_ftruncate() wrapper; remove in-kernel calls to sys_ftruncate() 

Using the ksys_ftruncate() wrapper allows us to get rid of in-kernel
calls to the sys_ftruncate() 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_ftruncate().

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 55731b3c

arch/mips/kernel/linux32.c

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ SYSCALL_DEFINE4(32_truncate64, const char __user *, path, 
SYSCALL_DEFINE4(32_ftruncate64, unsigned long, fd, unsigned long, __dummy,

	unsigned long, a2, unsigned long, a3)

{

	return sys_ftruncate(fd, merge_64(a2, a3));

	return ksys_ftruncate(fd, merge_64(a2, a3));

}



SYSCALL_DEFINE5(32_llseek, unsigned int, fd, unsigned int, offset_high,

arch/parisc/kernel/sys_parisc.c

+2 −2
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ asmlinkage long parisc_truncate64(const char __user * path, 
asmlinkage long parisc_ftruncate64(unsigned int fd,

					unsigned int high, unsigned int low)

{

	return sys_ftruncate(fd, (long)high << 32 | low);

	return ksys_ftruncate(fd, (long)high << 32 | low);

}



/* stubs for the benefit of the syscall_table since truncate64 and truncate
@@ -309,7 +309,7 @@ asmlinkage long sys_truncate64(const char __user * path, unsigned long length) 
}

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

{

	return sys_ftruncate(fd, length);

	return ksys_ftruncate(fd, length);

}

asmlinkage long sys_fcntl64(unsigned int fd, unsigned int cmd, unsigned long arg)

{

arch/powerpc/kernel/sys_ppc32.c

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ asmlinkage long compat_sys_fallocate(int fd, int mode, u32 offhi, u32 offlo, 
asmlinkage int compat_sys_ftruncate64(unsigned int fd, u32 reg4, unsigned long high,

				 unsigned long low)

{

	return sys_ftruncate(fd, (high << 32) | low);

	return ksys_ftruncate(fd, (high << 32) | low);

}



long ppc32_fadvise64(int fd, u32 unused, u32 offset_high, u32 offset_low,

arch/s390/kernel/compat_linux.c

+1 −1
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ COMPAT_SYSCALL_DEFINE3(s390_truncate64, const char __user *, path, u32, high, u3 


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

{

	return sys_ftruncate(fd, (unsigned long)high << 32 | low);

	return ksys_ftruncate(fd, (unsigned long)high << 32 | low);

}



COMPAT_SYSCALL_DEFINE5(s390_pread64, unsigned int, fd, char __user *, ubuf,

arch/sparc/kernel/sys_sparc32.c

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ asmlinkage long sys32_ftruncate64(unsigned int fd, unsigned long high, unsigned 
	if ((int)high < 0)

		return -EINVAL;

	else

		return sys_ftruncate(fd, (high << 32) | low);

		return ksys_ftruncate(fd, (high << 32) | low);

}



static int cp_compat_stat64(struct kstat *stat,

CRA Git | Maintained and supported by SUSTech CRA and CCSE