Introduce fixed sys_sync_file_range2() syscall, implement on PowerPC and ARM

Not all the world is an i386. Many architectures need 64-bit arguments to be aligned in suitable pairs of registers, and the original sys_sync_file_range(int, loff_t, loff_t, int) was therefore wasting an argument register for padding after the first integer. Since we don't normally have more than 6 arguments for system calls, that left no room for the final argument on some architectures. Fix this by introducing sys_sync_file_range2(int, int, loff_t, loff_t) which all fits nicely. In fact, ARM already had that, but called it sys_arm_sync_file_range. Move it to fs/sync.c and rename it, then implement the needed compatibility routine. And stop the missing syscall check from bitching about the absence of sys_sync_file_range() if we've implemented sys_sync_file_range2() instead. Tested on PPC32 and with 32-bit and 64-bit userspace on PPC64.

David Woodhouse committed 19 years ago

Commit edd5cd41 parent 2f4d4da9 files · +29 −15Browse files

Showing the changes to include (4 of 9 files). Show all

Unified · Split

4 files

include/asm-arm/unistd.h +1 −0
include/asm-powerpc/systbl.h +1 −0
include/asm-powerpc/unistd.h +2 −1
include/linux/syscalls.h +2 −0

include/asm-arm/unistd.h+1−0

@@ -367,6 +367,7 @@ · 366 unmodified lines
367	#define __NR_get_robust_list (__NR_SYSCALL_BASE+339)	367	#define __NR_get_robust_list (__NR_SYSCALL_BASE+339)
368	#define __NR_splice (__NR_SYSCALL_BASE+340)	368	#define __NR_splice (__NR_SYSCALL_BASE+340)
369	#define __NR_arm_sync_file_range (__NR_SYSCALL_BASE+341)	369	#define __NR_arm_sync_file_range (__NR_SYSCALL_BASE+341)
		370	#define __NR_sync_file_range2 __NR_arm_sync_file_range
370	#define __NR_tee (__NR_SYSCALL_BASE+342)	371	#define __NR_tee (__NR_SYSCALL_BASE+342)
371	#define __NR_vmsplice (__NR_SYSCALL_BASE+343)	372	#define __NR_vmsplice (__NR_SYSCALL_BASE+343)
372	#define __NR_move_pages (__NR_SYSCALL_BASE+344)	373	#define __NR_move_pages (__NR_SYSCALL_BASE+344)

include/asm-powerpc/systbl.h+1−0

@@ -311,3 +311,4 @@ COMPAT_SYS_SPU(utimensat) · 310 unmodified lines
311	COMPAT_SYS_SPU(signalfd)	311	COMPAT_SYS_SPU(signalfd)
312	COMPAT_SYS_SPU(timerfd)	312	COMPAT_SYS_SPU(timerfd)
313	SYSCALL_SPU(eventfd)	313	SYSCALL_SPU(eventfd)
		314	COMPAT_SYS_SPU(sync_file_range2)

include/asm-powerpc/unistd.h+2−1

 #define __NR_signalfd		305
 #define __NR_timerfd		306
 #define __NR_eventfd		307
+#define __NR_sync_file_range2	308
 #ifdef __KERNEL__
-#define __NR_syscalls		308
+#define __NR_syscalls		309
 #define __NR__exit __NR_exit
 #define NR_syscalls	__NR_syscalls

include/linux/syscalls.h+2−0

@@ -598,6 +598,8 @@ asmlinkage long sys_tee(int fdin, int fdout, size_t len, unsigned int flags); · 597 unmodified lines
598		598
599	asmlinkage long sys_sync_file_range(int fd, loff_t offset, loff_t nbytes,	599	asmlinkage long sys_sync_file_range(int fd, loff_t offset, loff_t nbytes,
600	unsigned int flags);	600	unsigned int flags);
		601	asmlinkage long sys_sync_file_range2(int fd, unsigned int flags,
		602	loff_t offset, loff_t nbytes);
601	asmlinkage long sys_get_robust_list(int pid,	603	asmlinkage long sys_get_robust_list(int pid,
602	struct robust_list_head __user * __user *head_ptr,	604	struct robust_list_head __user * __user *head_ptr,
603	size_t __user *len_ptr);	605	size_t __user *len_ptr);