[SPARC64]: Convert for stat/utime compat syscall changes.

diff --git a/arch/sparc64/kernel/sys_sparc32.c b/arch/sparc64/kernel/sys_sparc32.c
index 5e33286b260dbd6b66420858eb0c5dbe327773fa..164b23c5873614e7698bc54bd76fc522e620df6f 100644 (file)
--- a/arch/sparc64/kernel/sys_sparc32.c
+++ b/arch/sparc64/kernel/sys_sparc32.c
@@ -1397,7 +1397,7 @@ out_nofds:
        return ret;
 }
 
-static int cp_new_stat32(struct kstat *stat, struct stat32 *statbuf)
+static int cp_compat_stat(struct kstat *stat, struct compat_stat *statbuf)
 {
        int err;
 
@@ -1425,39 +1425,6 @@ static int cp_new_stat32(struct kstat *stat, struct stat32 *statbuf)
        return err;
 }
 
-asmlinkage int sys32_newstat(char * filename, struct stat32 *statbuf)
-{
-       struct kstat stat;
-       int error = vfs_stat(filename, &stat);
-
-       if (!error)
-               error = cp_new_stat32(&stat, statbuf);
-
-       return error;
-}
-
-asmlinkage int sys32_newlstat(char * filename, struct stat32 *statbuf)
-{
-       struct kstat stat;
-       int error = vfs_lstat(filename, &stat);
-
-       if (!error)
-               error = cp_new_stat32(&stat, statbuf);
-
-       return error;
-}
-
-asmlinkage int sys32_newfstat(unsigned int fd, struct stat32 *statbuf)
-{
-       struct kstat stat;
-       int error = vfs_fstat(fd, &stat);
-
-       if (!error)
-               error = cp_new_stat32(&stat, statbuf);
-
-       return error;
-}
-
 extern asmlinkage int sys_sysfs(int option, unsigned long arg1, unsigned long arg2);
 
 asmlinkage int sys32_sysfs(int option, u32 arg1, u32 arg2)
@@ -3463,8 +3430,6 @@ asmlinkage int sys32_settimeofday(struct compat_timeval *tv, struct timezone *tz
        return do_sys_settimeofday(tv ? &ktv : NULL, tz ? &ktz : NULL);
 }
 
-asmlinkage int sys_utimes(char *, struct timeval *);
-
 asmlinkage int sys32_utimes(char *filename, struct compat_timeval *tvs)
 {
        char *kfilename;
@@ -3483,7 +3448,7 @@ asmlinkage int sys32_utimes(char *filename, struct compat_timeval *tvs)
 
                old_fs = get_fs();
                set_fs(KERNEL_DS);
-               ret = sys_utimes(kfilename, &ktvs[0]);
+               ret = do_utimes(kfilename, (tvs ? &ktvs[0] : NULL));
                set_fs(old_fs);
 
                putname(kfilename);

diff --git a/arch/sparc64/kernel/systbls.S b/arch/sparc64/kernel/systbls.S
index 60d7b592c0746a50244790e6afca229fa26fb906..86a1e1aa8a98130154fd245b10d9d0a35a3fe093 100644 (file)
--- a/arch/sparc64/kernel/systbls.S
+++ b/arch/sparc64/kernel/systbls.S
@@ -26,12 +26,12 @@ sys_call_table32:
 /*20*/ .word sys_getpid, sys_capget, sys_capset, sys32_setuid16, sys32_getuid16
 /*25*/ .word sys_time, sys_ptrace, sys_alarm, sys32_sigaltstack, sys32_pause
 /*30*/ .word compat_sys_utime, sys_lchown, sys_fchown, sys_access, sys_nice
-       .word sys_chown, sys_sync, sys_kill, sys32_newstat, sys32_sendfile
-/*40*/ .word sys32_newlstat, sys_dup, sys_pipe, sys32_times, sys_getuid
+       .word sys_chown, sys_sync, sys_kill, compat_sys_newstat, sys32_sendfile
+/*40*/ .word compat_sys_newlstat, sys_dup, sys_pipe, sys32_times, sys_getuid
        .word sys_umount, sys32_setgid16, sys32_getgid16, sys_signal, sys32_geteuid16
 /*50*/ .word sys32_getegid16, sys_acct, sys_nis_syscall, sys_getgid, sys32_ioctl
        .word sys_reboot, sys32_mmap2, sys_symlink, sys_readlink, sys32_execve
-/*60*/ .word sys_umask, sys_chroot, sys32_newfstat, sys_fstat64, sys_getpagesize
+/*60*/ .word sys_umask, sys_chroot, compat_sys_newfstat, sys_fstat64, sys_getpagesize
        .word sys_msync, sys_vfork, sys32_pread64, sys32_pwrite64, sys_geteuid
 /*70*/ .word sys_getegid, sys32_mmap, sys_setreuid, sys_munmap, sys_mprotect
        .word sys_madvise, sys_vhangup, sys32_truncate64, sys_mincore, sys32_getgroups16

diff --git a/include/asm-sparc64/stat.h b/include/asm-sparc64/stat.h
index a1d8dc8acfcd75b8a86de53deb2c89a10ddeb6bc..78acd588d958c7e637b830baa77c534faaeb01fd 100644 (file)
--- a/include/asm-sparc64/stat.h
+++ b/include/asm-sparc64/stat.h
@@ -6,7 +6,7 @@
 #include <linux/compat.h>
 #include <linux/time.h>
 
-struct stat32 {
+struct compat_stat {
        __kernel_dev_t32   st_dev;
        __kernel_ino_t32   st_ino;
        __kernel_mode_t32  st_mode;