[COMPAT] compat_sys_[f]statfs - sparc64 part

diff --git a/arch/sparc64/kernel/sys_sparc32.c b/arch/sparc64/kernel/sys_sparc32.c
index e28dcd1e6e8a3f78aaed628d089f8031fd818d45..8b51679f8430a4e0a882edf8e712dffa4fd1da06 100644 (file)
--- a/arch/sparc64/kernel/sys_sparc32.c
+++ b/arch/sparc64/kernel/sys_sparc32.c
@@ -840,61 +840,6 @@ asmlinkage long sys32_fcntl64(unsigned int fd, unsigned int cmd, unsigned long a
        return sys32_fcntl(fd, cmd, arg);
 }
 
-static int put_statfs (struct statfs32 *ubuf, struct statfs *kbuf)
-{
-       int err;
-       
-       err = put_user (kbuf->f_type, &ubuf->f_type);
-       err |= __put_user (kbuf->f_bsize, &ubuf->f_bsize);
-       err |= __put_user (kbuf->f_blocks, &ubuf->f_blocks);
-       err |= __put_user (kbuf->f_bfree, &ubuf->f_bfree);
-       err |= __put_user (kbuf->f_bavail, &ubuf->f_bavail);
-       err |= __put_user (kbuf->f_files, &ubuf->f_files);
-       err |= __put_user (kbuf->f_ffree, &ubuf->f_ffree);
-       err |= __put_user (kbuf->f_namelen, &ubuf->f_namelen);
-       err |= __put_user (kbuf->f_fsid.val[0], &ubuf->f_fsid.val[0]);
-       err |= __put_user (kbuf->f_fsid.val[1], &ubuf->f_fsid.val[1]);
-       return err;
-}
-
-extern asmlinkage int sys_statfs(const char * path, struct statfs * buf);
-
-asmlinkage int sys32_statfs(const char * path, struct statfs32 *buf)
-{
-       int ret;
-       struct statfs s;
-       mm_segment_t old_fs = get_fs();
-       char *pth;
-       
-       pth = getname (path);
-       ret = PTR_ERR(pth);
-       if (!IS_ERR(pth)) {
-               set_fs (KERNEL_DS);
-               ret = sys_statfs((const char *)pth, &s);
-               set_fs (old_fs);
-               putname (pth);
-               if (put_statfs(buf, &s))
-                       return -EFAULT;
-       }
-       return ret;
-}
-
-extern asmlinkage int sys_fstatfs(unsigned int fd, struct statfs * buf);
-
-asmlinkage int sys32_fstatfs(unsigned int fd, struct statfs32 *buf)
-{
-       int ret;
-       struct statfs s;
-       mm_segment_t old_fs = get_fs();
-       
-       set_fs (KERNEL_DS);
-       ret = sys_fstatfs(fd, &s);
-       set_fs (old_fs);
-       if (put_statfs(buf, &s))
-               return -EFAULT;
-       return ret;
-}
-
 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/sparc64/kernel/systbls.S b/arch/sparc64/kernel/systbls.S
index 8321c00cbb0b84ad3480b247744b2d7dfdb7c2d6..12069b2b810dab09bebc1cfabdf8e14824e3d478 100644 (file)
--- a/arch/sparc64/kernel/systbls.S
+++ b/arch/sparc64/kernel/systbls.S
@@ -50,7 +50,7 @@ sys_call_table32:
 /*140*/        .word sys32_sendfile64, sys_nis_syscall, sys_futex, sys_gettid, sys32_getrlimit
        .word sys32_setrlimit, sys_pivot_root, sys32_prctl, sys32_pciconfig_read, sys32_pciconfig_write
 /*150*/        .word sys_nis_syscall, sys_nis_syscall, sys_nis_syscall, sys_poll, sys_getdents64
-       .word sys32_fcntl64, sys_ni_syscall, sys32_statfs, sys32_fstatfs, sys_oldumount
+       .word sys32_fcntl64, sys_ni_syscall, compat_sys_statfs, compat_sys_fstatfs, sys_oldumount
 /*160*/        .word sys32_sched_setaffinity, sys32_sched_getaffinity, sys_getdomainname, sys_setdomainname, sys_nis_syscall
        .word sys_quotactl, sys_set_tid_address, sys32_mount, sys_ustat, sys_setxattr
 /*170*/        .word sys_lsetxattr, sys_fsetxattr, sys_getxattr, sys_lgetxattr, sys32_getdents
@@ -197,7 +197,7 @@ sunos_sys_table:
        .word sunos_nosys, sunos_nosys
 /*150*/        .word sys_getsockname, sunos_nosys, sunos_nosys
        .word sys_poll, sunos_nosys, sunos_nosys
-       .word sunos_getdirentries, sys32_statfs, sys32_fstatfs
+       .word sunos_getdirentries, compat_sys_statfs, compat_sys_fstatfs
        .word sys_oldumount, sunos_nosys, sunos_nosys
        .word sys_getdomainname, sys_setdomainname
        .word sunos_nosys, sys_quotactl, sunos_nosys

diff --git a/include/asm-sparc64/compat.h b/include/asm-sparc64/compat.h
index bf8792ec92bb94b9420caf33090dbccd8c4cf27d..6e6111e478fe76f152a475713f7da68562ee7d72 100644 (file)
--- a/include/asm-sparc64/compat.h
+++ b/include/asm-sparc64/compat.h
@@ -64,4 +64,17 @@ struct compat_flock {
        short           __unused;
 };
 
+struct compat_statfs {
+       int             f_type;
+       int             f_bsize;
+       int             f_blocks;
+       int             f_bfree;
+       int             f_bavail;
+       int             f_files;
+       int             f_ffree;
+       compat_fsid_t   f_fsid;
+       int             f_namelen;      /* SunOS ignores this field. */
+       int             f_spare[6];
+};
+
 #endif /* _ASM_SPARC64_COMPAT_H */

diff --git a/include/asm-sparc64/statfs.h b/include/asm-sparc64/statfs.h
index 116ae18147028a1c543b4706fd7231b9158adc36..3866255b84deb60021705e832fd74cf693f2c2ad 100644 (file)
--- a/include/asm-sparc64/statfs.h
+++ b/include/asm-sparc64/statfs.h
@@ -5,25 +5,11 @@
 #ifndef __KERNEL_STRICT_NAMES
 
 #include <linux/types.h>
-#include <linux/compat.h>      /* for compat_fsid_t */
 
 typedef __kernel_fsid_t        fsid_t;
 
 #endif
 
-struct statfs32 {
-       int f_type;
-       int f_bsize;
-       int f_blocks;
-       int f_bfree;
-       int f_bavail;
-       int f_files;
-       int f_ffree;
-       compat_fsid_t f_fsid;
-       int f_namelen;  /* SunOS ignores this field. */
-       int f_spare[6];
-};
-
 struct statfs {
        long f_type;
        long f_bsize;