Introduce fixed sys_sync_file_range2() syscall, implement on PowerPC and ARM
authorDavid Woodhouse <dwmw2@infradead.org>
Wed, 27 Jun 2007 21:10:09 +0000 (14:10 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 28 Jun 2007 18:38:30 +0000 (11:38 -0700)
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>
arch/arm/kernel/calls.S
arch/arm/kernel/sys_arm.c
arch/powerpc/kernel/sys_ppc32.c
fs/sync.c
include/asm-arm/unistd.h
include/asm-powerpc/systbl.h
include/asm-powerpc/unistd.h
include/linux/syscalls.h
scripts/checksyscalls.sh

index 19326d7cdeb3cdf6a517e1c25f27b0c4fbaab4fa..a98d0c933db0afd28b8c0a7885675ca131e4b865 100644 (file)
                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)
index 1ca2d5174fcb6914ee86030b23812063e329796b..4d25e49a14f7ca4eed6eea0a932fea2518fd8908 100644 (file)
@@ -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);
-}
index 047246ad4f6559887756b780abff120c36ceb417..b42cbf1e2d7d8f650a5ca6901629efc780777024 100644 (file)
@@ -810,3 +810,12 @@ asmlinkage long compat_sys_request_key(const char __user *_type,
        return sys_request_key(_type, _description, _callout_info, destringid);
 }
 
+asmlinkage long compat_sys_sync_file_range2(int fd, unsigned int flags,
+                                  unsigned offset_hi, unsigned offset_lo,
+                                  unsigned nbytes_hi, unsigned nbytes_lo)
+{
+       loff_t offset = ((loff_t)offset_hi << 32) | offset_lo;
+       loff_t nbytes = ((loff_t)nbytes_hi << 32) | nbytes_lo;
+
+       return sys_sync_file_range(fd, offset, nbytes, flags);
+}
index 2f97576355b8828e2b952782860e5af7b3bebea2..7cd005ea76390f385dc85af2c11e8121b6b4dd69 100644 (file)
--- a/fs/sync.c
+++ b/fs/sync.c
@@ -236,6 +236,14 @@ out:
        return ret;
 }
 
+/* It would be nice if people remember that not all the world's an i386
+   when they introduce new system calls */
+asmlinkage long sys_sync_file_range2(int fd, unsigned int flags,
+                                    loff_t offset, loff_t nbytes)
+{
+       return sys_sync_file_range(fd, offset, nbytes, flags);
+}
+
 /*
  * `endbyte' is inclusive
  */
index 250d7f145acaed61fbb6c076a182ed41efda3fcd..bfdbebebdc1b77b334fade15af3ed6af9073f3c9 100644 (file)
 #define __NR_get_robust_list           (__NR_SYSCALL_BASE+339)
 #define __NR_splice                    (__NR_SYSCALL_BASE+340)
 #define __NR_arm_sync_file_range       (__NR_SYSCALL_BASE+341)
+#define __NR_sync_file_range2          __NR_arm_sync_file_range
 #define __NR_tee                       (__NR_SYSCALL_BASE+342)
 #define __NR_vmsplice                  (__NR_SYSCALL_BASE+343)
 #define __NR_move_pages                        (__NR_SYSCALL_BASE+344)
index 700ca5928741ada0f91c1e6a668a4d5636081b42..1cc3f9cb6f4e104db5e16cb2f2ad56e90c483c8c 100644 (file)
@@ -311,3 +311,4 @@ COMPAT_SYS_SPU(utimensat)
 COMPAT_SYS_SPU(signalfd)
 COMPAT_SYS_SPU(timerfd)
 SYSCALL_SPU(eventfd)
+COMPAT_SYS_SPU(sync_file_range2)
index e3c28dc31abf9a32b089a35c6297c29d768528b2..f71c6061f1ec8c16fcedfab05ea7d6c68daf06de 100644 (file)
 #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
index b02070eac422a31371b852cc50ade987b56e7660..83d0ec11235e1ccc2b405fe37f99a00f15e894d7 100644 (file)
@@ -598,6 +598,8 @@ asmlinkage long sys_tee(int fdin, int fdout, size_t len, unsigned int flags);
 
 asmlinkage long sys_sync_file_range(int fd, loff_t offset, loff_t nbytes,
                                        unsigned int flags);
+asmlinkage long sys_sync_file_range2(int fd, unsigned int flags,
+                                    loff_t offset, loff_t nbytes);
 asmlinkage long sys_get_robust_list(int pid,
                                    struct robust_list_head __user * __user *head_ptr,
                                    size_t __user *len_ptr);
index f98171f5a3dfe8f97dbcb397bda70e96443767d8..0dcc01ce45a608f576365b5a341a2edc43c23a67 100755 (executable)
@@ -99,6 +99,11 @@ cat << EOF
 #define __IGNORE_setfsuid32
 #define __IGNORE_setfsgid32
 
+/* sync_file_range had a stupid ABI. Allow sync_file_range2 instead */
+#ifdef __NR_sync_file_range2
+#define __IGNORE_sync_file_range
+#endif
+
 /* Unmerged syscalls for AFS, STREAMS, etc. */
 #define __IGNORE_afs_syscall
 #define __IGNORE_getpmsg