9 files changed, 39 insertions, 259 deletions

diff --git a/arch/ia64/ia32/sys_ia32.c b/arch/ia64/ia32/sys_ia32.c
index bf196cbb3796..2362a8eefb30 100644
--- a/arch/ia64/ia32/sys_ia32.c
+++ b/arch/ia64/ia32/sys_ia32.c
@@ -118,41 +118,6 @@ sys32_execve (char __user *name, compat_uptr_t __user *argv, compat_uptr_t __use
         return error;
 }
 
-int cp_compat_stat(struct kstat *stat, struct compat_stat __user *ubuf)
-{
-        compat_ino_t ino;
-        int err;
-
-        if ((u64) stat->size > MAX_NON_LFS ||
-            !old_valid_dev(stat->dev) ||
-            !old_valid_dev(stat->rdev))
-                return -EOVERFLOW;
-
-        ino = stat->ino;
-        if (sizeof(ino) < sizeof(stat->ino) && ino != stat->ino)
-                return -EOVERFLOW;
-
-        if (clear_user(ubuf, sizeof(*ubuf)))
-                return -EFAULT;
-
-        err  = __put_user(old_encode_dev(stat->dev), &ubuf->st_dev);
-        err |= __put_user(ino, &ubuf->st_ino);
-        err |= __put_user(stat->mode, &ubuf->st_mode);
-        err |= __put_user(stat->nlink, &ubuf->st_nlink);
-        err |= __put_user(high2lowuid(stat->uid), &ubuf->st_uid);
-        err |= __put_user(high2lowgid(stat->gid), &ubuf->st_gid);
-        err |= __put_user(old_encode_dev(stat->rdev), &ubuf->st_rdev);
-        err |= __put_user(stat->size, &ubuf->st_size);
-        err |= __put_user(stat->atime.tv_sec, &ubuf->st_atime);
-        err |= __put_user(stat->atime.tv_nsec, &ubuf->st_atime_nsec);
-        err |= __put_user(stat->mtime.tv_sec, &ubuf->st_mtime);
-        err |= __put_user(stat->mtime.tv_nsec, &ubuf->st_mtime_nsec);
-        err |= __put_user(stat->ctime.tv_sec, &ubuf->st_ctime);
-        err |= __put_user(stat->ctime.tv_nsec, &ubuf->st_ctime_nsec);
-        err |= __put_user(stat->blksize, &ubuf->st_blksize);
-        err |= __put_user(stat->blocks, &ubuf->st_blocks);
-        return err;
-}
 
 #if PAGE_SHIFT > IA32_PAGE_SHIFT
 
diff --git a/arch/mips/kernel/linux32.c b/arch/mips/kernel/linux32.c
index 2fefb14414b7..89223a9bff2c 100644
--- a/arch/mips/kernel/linux32.c
+++ b/arch/mips/kernel/linux32.c
@@ -63,41 +63,6 @@
 #define merge_64(r1, r2) ((((r2) & 0xffffffffUL) << 32) + ((r1) & 0xffffffffUL))
 #endif
 
-/*
- * Revalidate the inode. This is required for proper NFS attribute caching.
- */
-
-int cp_compat_stat(struct kstat *stat, struct compat_stat __user *statbuf)
-{
-        struct compat_stat tmp;
-
-        if (!new_valid_dev(stat->dev) || !new_valid_dev(stat->rdev))
-                return -EOVERFLOW;
-
-        memset(&tmp, 0, sizeof(tmp));
-        tmp.st_dev = new_encode_dev(stat->dev);
-        tmp.st_ino = stat->ino;
-        if (sizeof(tmp.st_ino) < sizeof(stat->ino) && tmp.st_ino != stat->ino)
-                return -EOVERFLOW;
-        tmp.st_mode = stat->mode;
-        tmp.st_nlink = stat->nlink;
-        SET_UID(tmp.st_uid, stat->uid);
-        SET_GID(tmp.st_gid, stat->gid);
-        tmp.st_rdev = new_encode_dev(stat->rdev);
-        tmp.st_size = stat->size;
-        tmp.st_atime = stat->atime.tv_sec;
-        tmp.st_mtime = stat->mtime.tv_sec;
-        tmp.st_ctime = stat->ctime.tv_sec;
-#ifdef STAT_HAVE_NSEC
-        tmp.st_atime_nsec = stat->atime.tv_nsec;
-        tmp.st_mtime_nsec = stat->mtime.tv_nsec;
-        tmp.st_ctime_nsec = stat->ctime.tv_nsec;
-#endif
-        tmp.st_blocks = stat->blocks;
-        tmp.st_blksize = stat->blksize;
-        return copy_to_user(statbuf, &tmp, sizeof(tmp)) ? -EFAULT : 0;
-}
-
 asmlinkage unsigned long
 sys32_mmap2(unsigned long addr, unsigned long len, unsigned long prot,
          unsigned long flags, unsigned long fd, unsigned long pgoff)
diff --git a/arch/parisc/kernel/sys_parisc32.c b/arch/parisc/kernel/sys_parisc32.c
index 71efd6a28e2a..2c3af17e049c 100644
--- a/arch/parisc/kernel/sys_parisc32.c
+++ b/arch/parisc/kernel/sys_parisc32.c
@@ -237,53 +237,6 @@ int sys32_settimeofday(struct compat_timeval __user *tv, struct timezone __user
         return do_sys_settimeofday(tv ? &kts : NULL, tz ? &ktz : NULL);
 }
 
-int cp_compat_stat(struct kstat *stat, struct compat_stat __user *statbuf)
-{
-        compat_ino_t ino;
-        int err;
-
-        if (stat->size > MAX_NON_LFS || !new_valid_dev(stat->dev) ||
-            !new_valid_dev(stat->rdev))
-                return -EOVERFLOW;
-
-        ino = stat->ino;
-        if (sizeof(ino) < sizeof(stat->ino) && ino != stat->ino)
-                return -EOVERFLOW;
-
-        err  = put_user(new_encode_dev(stat->dev), &statbuf->st_dev);
-        err |= put_user(ino, &statbuf->st_ino);
-        err |= put_user(stat->mode, &statbuf->st_mode);
-        err |= put_user(stat->nlink, &statbuf->st_nlink);
-        err |= put_user(0, &statbuf->st_reserved1);
-        err |= put_user(0, &statbuf->st_reserved2);
-        err |= put_user(new_encode_dev(stat->rdev), &statbuf->st_rdev);
-        err |= put_user(stat->size, &statbuf->st_size);
-        err |= put_user(stat->atime.tv_sec, &statbuf->st_atime);
-        err |= put_user(stat->atime.tv_nsec, &statbuf->st_atime_nsec);
-        err |= put_user(stat->mtime.tv_sec, &statbuf->st_mtime);
-        err |= put_user(stat->mtime.tv_nsec, &statbuf->st_mtime_nsec);
-        err |= put_user(stat->ctime.tv_sec, &statbuf->st_ctime);
-        err |= put_user(stat->ctime.tv_nsec, &statbuf->st_ctime_nsec);
-        err |= put_user(stat->blksize, &statbuf->st_blksize);
-        err |= put_user(stat->blocks, &statbuf->st_blocks);
-        err |= put_user(0, &statbuf->__unused1);
-        err |= put_user(0, &statbuf->__unused2);
-        err |= put_user(0, &statbuf->__unused3);
-        err |= put_user(0, &statbuf->__unused4);
-        err |= put_user(0, &statbuf->__unused5);
-        err |= put_user(0, &statbuf->st_fstype); /* not avail */
-        err |= put_user(0, &statbuf->st_realdev); /* not avail */
-        err |= put_user(0, &statbuf->st_basemode); /* not avail */
-        err |= put_user(0, &statbuf->st_spareshort);
-        err |= put_user(stat->uid, &statbuf->st_uid);
-        err |= put_user(stat->gid, &statbuf->st_gid);
-        err |= put_user(0, &statbuf->st_spare4[0]);
-        err |= put_user(0, &statbuf->st_spare4[1]);
-        err |= put_user(0, &statbuf->st_spare4[2]);
-
-        return err;
-}
-
 /*** copied from mips64 ***/
 /*
  * Ooo, nasty.  We need here to frob 32-bit unsigned longs to
diff --git a/arch/powerpc/kernel/sys_ppc32.c b/arch/powerpc/kernel/sys_ppc32.c
index ff7de7b0797e..d00599bb24a1 100644
--- a/arch/powerpc/kernel/sys_ppc32.c
+++ b/arch/powerpc/kernel/sys_ppc32.c
@@ -61,42 +61,6 @@ asmlinkage long ppc32_select(u32 n, compat_ulong_t __user *inp,
         return compat_sys_select((int)n, inp, outp, exp, compat_ptr(tvp_x));
 }
 
-int cp_compat_stat(struct kstat *stat, struct compat_stat __user *statbuf)
-{
-        compat_ino_t ino;
-        long err;
-
-        if (stat->size > MAX_NON_LFS || !new_valid_dev(stat->dev) ||
-            !new_valid_dev(stat->rdev))
-                return -EOVERFLOW;
-
-        ino = stat->ino;
-        if (sizeof(ino) < sizeof(stat->ino) && ino != stat->ino)
-                return -EOVERFLOW;
-
-        err  = access_ok(VERIFY_WRITE, statbuf, sizeof(*statbuf)) ? 0 : -EFAULT;
-        err |= __put_user(new_encode_dev(stat->dev), &statbuf->st_dev);
-        err |= __put_user(ino, &statbuf->st_ino);
-        err |= __put_user(stat->mode, &statbuf->st_mode);
-        err |= __put_user(stat->nlink, &statbuf->st_nlink);
-        err |= __put_user(stat->uid, &statbuf->st_uid);
-        err |= __put_user(stat->gid, &statbuf->st_gid);
-        err |= __put_user(new_encode_dev(stat->rdev), &statbuf->st_rdev);
-        err |= __put_user(stat->size, &statbuf->st_size);
-        err |= __put_user(stat->atime.tv_sec, &statbuf->st_atime);
-        err |= __put_user(stat->atime.tv_nsec, &statbuf->st_atime_nsec);
-        err |= __put_user(stat->mtime.tv_sec, &statbuf->st_mtime);
-        err |= __put_user(stat->mtime.tv_nsec, &statbuf->st_mtime_nsec);
-        err |= __put_user(stat->ctime.tv_sec, &statbuf->st_ctime);
-        err |= __put_user(stat->ctime.tv_nsec, &statbuf->st_ctime_nsec);
-        err |= __put_user(stat->blksize, &statbuf->st_blksize);
-        err |= __put_user(stat->blocks, &statbuf->st_blocks);
-        err |= __put_user(0, &statbuf->__unused4[0]);
-        err |= __put_user(0, &statbuf->__unused4[1]);
-
-        return err;
-}
-
 /* Note: it is necessary to treat option as an unsigned int,
  * with the corresponding cast to a signed int to insure that the 
  * proper conversion (sign extension) between the register representation of a signed int (msr in 32-bit mode)
diff --git a/arch/s390/kernel/compat_linux.c b/arch/s390/kernel/compat_linux.c
index 98e246dc0233..9b471d785ec1 100644
--- a/arch/s390/kernel/compat_linux.c
+++ b/arch/s390/kernel/compat_linux.c
@@ -362,41 +362,6 @@ asmlinkage long sys32_ftruncate64(unsigned int fd, unsigned long high, unsigned
                 return sys_ftruncate(fd, (high << 32) | low);
 }
 
-int cp_compat_stat(struct kstat *stat, struct compat_stat __user *statbuf)
-{
-        compat_ino_t ino;
-        int err;
-
-        if (!old_valid_dev(stat->dev) || !old_valid_dev(stat->rdev))
-                return -EOVERFLOW;
-
-        ino = stat->ino;
-        if (sizeof(ino) < sizeof(stat->ino) && ino != stat->ino)
-                return -EOVERFLOW;
-
-        err = put_user(old_encode_dev(stat->dev), &statbuf->st_dev);
-        err |= put_user(stat->ino, &statbuf->st_ino);
-        err |= put_user(stat->mode, &statbuf->st_mode);
-        err |= put_user(stat->nlink, &statbuf->st_nlink);
-        err |= put_user(high2lowuid(stat->uid), &statbuf->st_uid);
-        err |= put_user(high2lowgid(stat->gid), &statbuf->st_gid);
-        err |= put_user(old_encode_dev(stat->rdev), &statbuf->st_rdev);
-        err |= put_user(stat->size, &statbuf->st_size);
-        err |= put_user(stat->atime.tv_sec, &statbuf->st_atime);
-        err |= put_user(stat->atime.tv_nsec, &statbuf->st_atime_nsec);
-        err |= put_user(stat->mtime.tv_sec, &statbuf->st_mtime);
-        err |= put_user(stat->mtime.tv_nsec, &statbuf->st_mtime_nsec);
-        err |= put_user(stat->ctime.tv_sec, &statbuf->st_ctime);
-        err |= put_user(stat->ctime.tv_nsec, &statbuf->st_ctime_nsec);
-        err |= put_user(stat->blksize, &statbuf->st_blksize);
-        err |= put_user(stat->blocks, &statbuf->st_blocks);
-/* fixme
-        err |= put_user(0, &statbuf->__unused4[0]);
-        err |= put_user(0, &statbuf->__unused4[1]);
-*/
-        return err;
-}
-
 asmlinkage long sys32_sched_rr_get_interval(compat_pid_t pid,
                                 struct compat_timespec __user *interval)
 {
diff --git a/arch/sparc64/kernel/sys_sparc32.c b/arch/sparc64/kernel/sys_sparc32.c
index 3320c9d0075f..73a33dc3bcca 100644
--- a/arch/sparc64/kernel/sys_sparc32.c
+++ b/arch/sparc64/kernel/sys_sparc32.c
@@ -148,41 +148,6 @@ asmlinkage long sys32_ftruncate64(unsigned int fd, unsigned long high, unsigned
                 return sys_ftruncate(fd, (high << 32) | low);
 }
 
-int cp_compat_stat(struct kstat *stat, struct compat_stat __user *statbuf)
-{
-        compat_ino_t ino;
-        int err;
-
-        if (stat->size > MAX_NON_LFS || !old_valid_dev(stat->dev) ||
-            !old_valid_dev(stat->rdev))
-                return -EOVERFLOW;
-
-        ino = stat->ino;
-        if (sizeof(ino) < sizeof(stat->ino) && ino != stat->ino)
-                return -EOVERFLOW;
-
-        err  = put_user(old_encode_dev(stat->dev), &statbuf->st_dev);
-        err |= put_user(stat->ino, &statbuf->st_ino);
-        err |= put_user(stat->mode, &statbuf->st_mode);
-        err |= put_user(stat->nlink, &statbuf->st_nlink);
-        err |= put_user(high2lowuid(stat->uid), &statbuf->st_uid);
-        err |= put_user(high2lowgid(stat->gid), &statbuf->st_gid);
-        err |= put_user(old_encode_dev(stat->rdev), &statbuf->st_rdev);
-        err |= put_user(stat->size, &statbuf->st_size);
-        err |= put_user(stat->atime.tv_sec, &statbuf->st_atime);
-        err |= put_user(stat->atime.tv_nsec, &statbuf->st_atime_nsec);
-        err |= put_user(stat->mtime.tv_sec, &statbuf->st_mtime);
-        err |= put_user(stat->mtime.tv_nsec, &statbuf->st_mtime_nsec);
-        err |= put_user(stat->ctime.tv_sec, &statbuf->st_ctime);
-        err |= put_user(stat->ctime.tv_nsec, &statbuf->st_ctime_nsec);
-        err |= put_user(stat->blksize, &statbuf->st_blksize);
-        err |= put_user(stat->blocks, &statbuf->st_blocks);
-        err |= put_user(0, &statbuf->__unused4[0]);
-        err |= put_user(0, &statbuf->__unused4[1]);
-
-        return err;
-}
-
 static int cp_compat_stat64(struct kstat *stat,
                             struct compat_stat64 __user *statbuf)
 {
diff --git a/arch/x86/ia32/sys_ia32.c b/arch/x86/ia32/sys_ia32.c
index beda4232ce69..4d3ad8d78a4d 100644
--- a/arch/x86/ia32/sys_ia32.c
+++ b/arch/x86/ia32/sys_ia32.c
@@ -49,41 +49,6 @@
 
 #define AA(__x)         ((unsigned long)(__x))
 
-int cp_compat_stat(struct kstat *kbuf, struct compat_stat __user *ubuf)
-{
-        compat_ino_t ino;
-
-        typeof(ubuf->st_uid) uid = 0;
-        typeof(ubuf->st_gid) gid = 0;
-        SET_UID(uid, kbuf->uid);
-        SET_GID(gid, kbuf->gid);
-        if (!old_valid_dev(kbuf->dev) || !old_valid_dev(kbuf->rdev))
-                return -EOVERFLOW;
-        if (kbuf->size >= 0x7fffffff)
-                return -EOVERFLOW;
-        ino = kbuf->ino;
-        if (sizeof(ino) < sizeof(kbuf->ino) && ino != kbuf->ino)
-                return -EOVERFLOW;
-        if (!access_ok(VERIFY_WRITE, ubuf, sizeof(struct compat_stat)) ||
-            __put_user(old_encode_dev(kbuf->dev), &ubuf->st_dev) ||
-            __put_user(ino, &ubuf->st_ino) ||
-            __put_user(kbuf->mode, &ubuf->st_mode) ||
-            __put_user(kbuf->nlink, &ubuf->st_nlink) ||
-            __put_user(uid, &ubuf->st_uid) ||
-            __put_user(gid, &ubuf->st_gid) ||
-            __put_user(old_encode_dev(kbuf->rdev), &ubuf->st_rdev) ||
-            __put_user(kbuf->size, &ubuf->st_size) ||
-            __put_user(kbuf->atime.tv_sec, &ubuf->st_atime) ||
-            __put_user(kbuf->atime.tv_nsec, &ubuf->st_atime_nsec) ||
-            __put_user(kbuf->mtime.tv_sec, &ubuf->st_mtime) ||
-            __put_user(kbuf->mtime.tv_nsec, &ubuf->st_mtime_nsec) ||
-            __put_user(kbuf->ctime.tv_sec, &ubuf->st_ctime) ||
-            __put_user(kbuf->ctime.tv_nsec, &ubuf->st_ctime_nsec) ||
-            __put_user(kbuf->blksize, &ubuf->st_blksize) ||
-            __put_user(kbuf->blocks, &ubuf->st_blocks))
-                return -EFAULT;
-        return 0;
-}
 
 asmlinkage long sys32_truncate64(char __user *filename,
                                  unsigned long offset_low,
diff --git a/fs/compat.c b/fs/compat.c
index aae13d31612f..5f9ec449c799 100644
--- a/fs/compat.c
+++ b/fs/compat.c
@@ -137,6 +137,45 @@ asmlinkage long compat_sys_utimes(char __user *filename, struct compat_timeval _
         return compat_sys_futimesat(AT_FDCWD, filename, t);
 }
 
+static int cp_compat_stat(struct kstat *stat, struct compat_stat __user *ubuf)
+{
+        compat_ino_t ino = stat->ino;
+        typeof(ubuf->st_uid) uid = 0;
+        typeof(ubuf->st_gid) gid = 0;
+        int err;
+
+        SET_UID(uid, stat->uid);
+        SET_GID(gid, stat->gid);
+
+        if ((u64) stat->size > MAX_NON_LFS ||
+            !old_valid_dev(stat->dev) ||
+            !old_valid_dev(stat->rdev))
+                return -EOVERFLOW;
+        if (sizeof(ino) < sizeof(stat->ino) && ino != stat->ino)
+                return -EOVERFLOW;
+
+        if (clear_user(ubuf, sizeof(*ubuf)))
+                return -EFAULT;
+
+        err  = __put_user(old_encode_dev(stat->dev), &ubuf->st_dev);
+        err |= __put_user(ino, &ubuf->st_ino);
+        err |= __put_user(stat->mode, &ubuf->st_mode);
+        err |= __put_user(stat->nlink, &ubuf->st_nlink);
+        err |= __put_user(uid, &ubuf->st_uid);
+        err |= __put_user(gid, &ubuf->st_gid);
+        err |= __put_user(old_encode_dev(stat->rdev), &ubuf->st_rdev);
+        err |= __put_user(stat->size, &ubuf->st_size);
+        err |= __put_user(stat->atime.tv_sec, &ubuf->st_atime);
+        err |= __put_user(stat->atime.tv_nsec, &ubuf->st_atime_nsec);
+        err |= __put_user(stat->mtime.tv_sec, &ubuf->st_mtime);
+        err |= __put_user(stat->mtime.tv_nsec, &ubuf->st_mtime_nsec);
+        err |= __put_user(stat->ctime.tv_sec, &ubuf->st_ctime);
+        err |= __put_user(stat->ctime.tv_nsec, &ubuf->st_ctime_nsec);
+        err |= __put_user(stat->blksize, &ubuf->st_blksize);
+        err |= __put_user(stat->blocks, &ubuf->st_blocks);
+        return err;
+}
+
 asmlinkage long compat_sys_newstat(char __user * filename,
                 struct compat_stat __user *statbuf)
 {
diff --git a/include/linux/compat.h b/include/linux/compat.h
index cf8d11cad5ae..999dddd8d939 100644
--- a/include/linux/compat.h
+++ b/include/linux/compat.h
@@ -78,7 +78,6 @@ typedef struct {
         compat_sigset_word      sig[_COMPAT_NSIG_WORDS];
 } compat_sigset_t;
 
-extern int cp_compat_stat(struct kstat *, struct compat_stat __user *);
 extern int get_compat_timespec(struct timespec *, const struct compat_timespec __user *);
 extern int put_compat_timespec(const struct timespec *, struct compat_timespec __user *);