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. Signed-off-by: David Woodhouse <dwmw2@infradead.org> Acked-by: Russell King <rmk+kernel@arm.linux.org.uk> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Paul Mackerras <paulus@samba.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
committed by
Linus Torvalds
parent
2f4d4da8f8
commit
edd5cd4a94
@ -350,7 +350,7 @@
|
||||
CALL(sys_set_robust_list)
|
||||
CALL(sys_get_robust_list)
|
||||
/* 340 */ CALL(sys_splice)
|
||||
CALL(sys_arm_sync_file_range)
|
||||
CALL(sys_sync_file_range2)
|
||||
CALL(sys_tee)
|
||||
CALL(sys_vmsplice)
|
||||
CALL(sys_move_pages)
|
||||
|
@ -328,16 +328,3 @@ asmlinkage long sys_arm_fadvise64_64(int fd, int advice,
|
||||
{
|
||||
return sys_fadvise64_64(fd, offset, len, advice);
|
||||
}
|
||||
|
||||
/*
|
||||
* Yet more syscall fsckage - we can't fit sys_sync_file_range's
|
||||
* arguments into the available registers with EABI. So, let's
|
||||
* create an ARM specific syscall for this which has _sane_
|
||||
* arguments. (This incidentally also has an ABI-independent
|
||||
* argument layout.)
|
||||
*/
|
||||
asmlinkage long sys_arm_sync_file_range(int fd, unsigned int flags,
|
||||
loff_t offset, loff_t nbytes)
|
||||
{
|
||||
return sys_sync_file_range(fd, offset, nbytes, flags);
|
||||
}
|
||||
|
Reference in New Issue
Block a user