[PATCH] compat_sys_fcntl{,64} s390x part

Here is the s390x part of the patch with Martin's blessing.

diff --git a/arch/s390x/kernel/entry.S b/arch/s390x/kernel/entry.S
index 0cd4f77920d6c5ca96fa81841411f852a5783cc4..10bac2f12c89f90cef18a75f0c04a7c3e25945ac 100644 (file)
--- a/arch/s390x/kernel/entry.S
+++ b/arch/s390x/kernel/entry.S
@@ -452,7 +452,7 @@ sys_call_table:
         .long  SYSCALL(sys_umount,sys32_umount_wrapper)
         .long  SYSCALL(sys_ni_syscall,sys_ni_syscall) /* old lock syscall */
         .long  SYSCALL(sys_ioctl,sys32_ioctl_wrapper)
-        .long  SYSCALL(sys_fcntl,sys32_fcntl_wrapper)   /* 55 */
+        .long  SYSCALL(sys_fcntl,compat_sys_fcntl_wrapper)   /* 55 */
         .long  SYSCALL(sys_ni_syscall,sys_ni_syscall) /* intel mpx syscall */
         .long  SYSCALL(sys_setpgid,sys32_setpgid_wrapper)
         .long  SYSCALL(sys_ni_syscall,sys_ni_syscall) /* old ulimit syscall */
@@ -618,7 +618,7 @@ sys_call_table:
         .long  SYSCALL(sys_mincore,sys32_mincore_wrapper)
         .long  SYSCALL(sys_madvise,sys32_madvise_wrapper)
        .long  SYSCALL(sys_getdents64,sys32_getdents64_wrapper)/* 220 */
-       .long  SYSCALL(sys_ni_syscall,sys32_fcntl64_wrapper)
+       .long  SYSCALL(sys_ni_syscall,compat_sys_fcntl64_wrapper)
        .long  SYSCALL(sys_readahead,sys32_readahead)
        .long  SYSCALL(sys_ni_syscall,sys32_sendfile64)
        .long  SYSCALL(sys_setxattr,sys32_setxattr_wrapper)

diff --git a/arch/s390x/kernel/linux32.c b/arch/s390x/kernel/linux32.c
index 4f1c9d32948dd5782d26607f1759cc09744101d9..b5dd62fa65722cc561220bb1f8b1fe4850b85112 100644 (file)
--- a/arch/s390x/kernel/linux32.c
+++ b/arch/s390x/kernel/linux32.c
@@ -834,57 +834,6 @@ out:
        return err;
 }
 
-extern asmlinkage long sys_fcntl(unsigned int fd, unsigned int cmd, unsigned long arg);
-
-asmlinkage long sys32_fcntl(unsigned int fd, unsigned int cmd, unsigned long arg)
-{
-       switch (cmd) {
-       case F_GETLK:
-               {
-                       struct flock f;
-                       mm_segment_t old_fs;
-                       long ret;
-                       
-                       if(get_compat_flock(&f, (struct compat_flock *)A(arg)))
-                               return -EFAULT;
-                       old_fs = get_fs(); set_fs (KERNEL_DS);
-                       ret = sys_fcntl(fd, cmd, (unsigned long)&f);
-                       set_fs (old_fs);
-                       if (ret) return ret;
-                       if (f.l_start >= 0x7fffffffUL ||
-                           f.l_start + f.l_len >= 0x7fffffffUL)
-                               return -EOVERFLOW;
-                       if(put_compat_flock(&f, (struct compat_flock *)A(arg)))
-                               return -EFAULT;
-                       return 0;
-               }
-       case F_SETLK:
-       case F_SETLKW:
-               {
-                       struct flock f;
-                       mm_segment_t old_fs;
-                       long ret;
-                       
-                       if(get_compat_flock(&f, (struct compat_flock *)A(arg)))
-                               return -EFAULT;
-                       old_fs = get_fs(); set_fs (KERNEL_DS);
-                       ret = sys_fcntl(fd, cmd, (unsigned long)&f);
-                       set_fs (old_fs);
-                       if (ret) return ret;
-                       return 0;
-               }
-       default:
-               return sys_fcntl(fd, cmd, (unsigned long)arg);
-       }
-}
-
-asmlinkage long sys32_fcntl64(unsigned int fd, unsigned int cmd, unsigned long arg)
-{
-       if (cmd >= F_GETLK64 && cmd <= F_SETLKW64)
-               return sys_fcntl(fd, cmd + F_GETLK - F_GETLK64, arg);
-       return sys32_fcntl(fd, cmd, arg);
-}
-
 extern asmlinkage long sys_truncate(const char * path, unsigned long length);
 extern asmlinkage long sys_ftruncate(unsigned int fd, unsigned long length);
 

diff --git a/arch/s390x/kernel/linux32.h b/arch/s390x/kernel/linux32.h
index 67689a6917ef19ce704b2e94972a7b19f2c5ea3b..b6ddb140e7eaca01eb04eabab22cd3d19aafc0cc 100644 (file)
--- a/arch/s390x/kernel/linux32.h
+++ b/arch/s390x/kernel/linux32.h
@@ -21,10 +21,6 @@ struct ipc_kludge_32 {
         __s32   msgtyp;
 };
 
-#define F_GETLK64       12
-#define F_SETLK64       13
-#define F_SETLKW64      14    
-
 struct old_sigaction32 {
        __u32                   sa_handler;     /* Really a pointer, but need to deal with 32 bits */
        compat_old_sigset_t     sa_mask;        /* A 32 bit mask */

diff --git a/arch/s390x/kernel/wrapper32.S b/arch/s390x/kernel/wrapper32.S
index 58dc3a5209a1bb8e8f85bb8301892317cd9ab772..6b45e7f1ee37dc9394d956c4d37f5e78cdf0c63f 100644 (file)
--- a/arch/s390x/kernel/wrapper32.S
+++ b/arch/s390x/kernel/wrapper32.S
@@ -227,12 +227,12 @@ sys32_ioctl_wrapper:
        llgfr   %r4,%r4                 # unsigned int
        jg      sys32_ioctl             # branch to system call
 
-       .globl  sys32_fcntl_wrapper 
-sys32_fcntl_wrapper:
+       .globl  compat_sys_fcntl_wrapper 
+compat_sys_fcntl_wrapper:
        llgfr   %r2,%r2                 # unsigned int
        llgfr   %r3,%r3                 # unsigned int 
        llgfr   %r4,%r4                 # unsigned long
-       jg      sys32_fcntl             # branch to system call
+       jg      compat_sys_fcntl        # branch to system call
 
        .globl  sys32_setpgid_wrapper 
 sys32_setpgid_wrapper:
@@ -1050,12 +1050,12 @@ sys32_getdents64_wrapper:
        llgfr   %r4,%r4                 # unsigned int
        jg      sys_getdents64          # branch to system call
 
-       .globl  sys32_fcntl64_wrapper 
-sys32_fcntl64_wrapper:
+       .globl  compat_sys_fcntl64_wrapper 
+compat_sys_fcntl64_wrapper:
        llgfr   %r2,%r2                 # unsigned int
        llgfr   %r3,%r3                 # unsigned int 
        llgfr   %r4,%r4                 # unsigned long
-       jg      sys32_fcntl64           # branch to system call
+       jg      compat_sys_fcntl64      # branch to system call
 
        .globl  sys32_stat64_wrapper
 sys32_stat64_wrapper:

diff --git a/include/asm-s390x/compat.h b/include/asm-s390x/compat.h
index 8541cce5a771914dce8c58ad21de213a0c14006d..55e23c9b36fe1319aa946bf6a81000185bc96dc6 100644 (file)
--- a/include/asm-s390x/compat.h
+++ b/include/asm-s390x/compat.h
@@ -64,7 +64,18 @@ struct compat_flock {
        compat_off_t    l_start;
        compat_off_t    l_len;
        compat_pid_t    l_pid;
-       short           __unused;
+};
+
+#define F_GETLK64       12
+#define F_SETLK64       13
+#define F_SETLKW64      14    
+
+struct compat_flock64 {
+       short           l_type;
+       short           l_whence;
+       compat_loff_t   l_start;
+       compat_loff_t   l_len;
+       compat_pid_t    l_pid;
 };
 
 struct compat_statfs {
@@ -87,4 +98,7 @@ typedef u32           compat_old_sigset_t;    /* at least 32 bits */
 
 typedef u32            compat_sigset_word;
 
+#define COMPAT_OFF_T_MAX       0x7fffffff
+#define COMPAT_LOFF_T_MAX      0x7fffffffffffffffL
+
 #endif /* _ASM_S390X_COMPAT_H */

diff --git a/include/asm-s390x/fcntl.h b/include/asm-s390x/fcntl.h
index 72d6e75623e0993fbae507108bb6cc547d32b130..eff0a9fc98e918581c5dd885fba4e8b238df2a5c 100644 (file)
--- a/include/asm-s390x/fcntl.h
+++ b/include/asm-s390x/fcntl.h
@@ -80,6 +80,4 @@ struct flock {
 
 #define F_LINUX_SPECIFIC_BASE  1024
 
-#define flock64   flock
-
 #endif