diff options
| -rw-r--r-- | arch/mips64/kernel/linux32.c | 177 | ||||
| -rw-r--r-- | include/asm-mips64/posix_types.h | 21 | ||||
| -rw-r--r-- | include/asm-mips64/stat.h | 26 |
3 files changed, 217 insertions, 7 deletions
diff --git a/arch/mips64/kernel/linux32.c b/arch/mips64/kernel/linux32.c index a544e2526..404d1cf95 100644 --- a/arch/mips64/kernel/linux32.c +++ b/arch/mips64/kernel/linux32.c @@ -1,7 +1,172 @@ -int sys32_newstat(void) {return 0;} -int sys32_newlstat(void) {return 0;} -int sys32_newfstat(void) {return 0;} -int sys_mmap2(void) {return 0;} -int sys_truncate64(void) {return 0;} -int sys_ftruncate64(void) {return 0;} +/* $Id$ + * + * Conversion between 32-bit and 64-bit native system calls. + * + * Copyright (C) 2000 Silicon Graphics, Inc. + * Written by Ulf Carlsson (ulfc@engr.sgi.com) + */ +#include <linux/mm.h> +#include <linux/errno.h> +#include <linux/file.h> +#include <linux/smp_lock.h> +#include <linux/highuid.h> + +#include <asm/uaccess.h> + +/* + * Revalidate the inode. This is required for proper NFS attribute caching. + */ +static __inline__ int +do_revalidate(struct dentry *dentry) +{ + struct inode * inode = dentry->d_inode; + if (inode->i_op && inode->i_op->revalidate) + return inode->i_op->revalidate(dentry); + return 0; +} + +static int cp_new_stat32(struct inode * inode, struct stat32 * statbuf) +{ + struct stat32 tmp; + unsigned int blocks, indirect; + + memset(&tmp, 0, sizeof(tmp)); + tmp.st_dev = kdev_t_to_nr(inode->i_dev); + tmp.st_ino = inode->i_ino; + tmp.st_mode = inode->i_mode; + tmp.st_nlink = inode->i_nlink; + SET_STAT_UID(tmp, inode->i_uid); + SET_STAT_GID(tmp, inode->i_gid); + tmp.st_rdev = kdev_t_to_nr(inode->i_rdev); + tmp.st_size = inode->i_size; + tmp.st_atime = inode->i_atime; + tmp.st_mtime = inode->i_mtime; + tmp.st_ctime = inode->i_ctime; +/* + * st_blocks and st_blksize are approximated with a simple algorithm if + * they aren't supported directly by the filesystem. The minix and msdos + * filesystems don't keep track of blocks, so they would either have to + * be counted explicitly (by delving into the file itself), or by using + * this simple algorithm to get a reasonable (although not 100% accurate) + * value. + */ + +/* + * Use minix fs values for the number of direct and indirect blocks. The + * count is now exact for the minix fs except that it counts zero blocks. + * Everything is in units of BLOCK_SIZE until the assignment to + * tmp.st_blksize. + */ +#define D_B 7 +#define I_B (BLOCK_SIZE / sizeof(unsigned short)) + + if (!inode->i_blksize) { + blocks = (tmp.st_size + BLOCK_SIZE - 1) / BLOCK_SIZE; + if (blocks > D_B) { + indirect = (blocks - D_B + I_B - 1) / I_B; + blocks += indirect; + if (indirect > 1) { + indirect = (indirect - 1 + I_B - 1) / I_B; + blocks += indirect; + if (indirect > 1) + blocks++; + } + } + tmp.st_blocks = (BLOCK_SIZE / 512) * blocks; + tmp.st_blksize = BLOCK_SIZE; + } else { + tmp.st_blocks = inode->i_blocks; + tmp.st_blksize = inode->i_blksize; + } + return copy_to_user(statbuf,&tmp,sizeof(tmp)) ? -EFAULT : 0; +} +asmlinkage int sys32_newstat(char * filename, struct stat32 *statbuf) +{ + struct dentry * dentry; + int error; + + lock_kernel(); + dentry = namei(filename); + + error = PTR_ERR(dentry); + if (!IS_ERR(dentry)) { + error = do_revalidate(dentry); + if (!error) + error = cp_new_stat32(dentry->d_inode, statbuf); + + dput(dentry); + } + unlock_kernel(); + return error; +} +asmlinkage int sys32_newlstat(char *filename, struct stat32 * statbuf) +{ + struct dentry * dentry; + int error; + + lock_kernel(); + dentry = lnamei(filename); + + error = PTR_ERR(dentry); + if (!IS_ERR(dentry)) { + error = do_revalidate(dentry); + if (!error) + error = cp_new_stat32(dentry->d_inode, statbuf); + + dput(dentry); + } + unlock_kernel(); + return error; +} + +asmlinkage int sys32_newfstat(unsigned int fd, struct stat32 * statbuf) +{ + struct file * f; + int err = -EBADF; + + lock_kernel(); + f = fget(fd); + if (f) { + struct dentry * dentry = f->f_dentry; + + err = do_revalidate(dentry); + if (!err) + err = cp_new_stat32(dentry->d_inode, statbuf); + fput(f); + } + unlock_kernel(); + return err; +} +asmlinkage int sys_mmap2(void) {return 0;} + +asmlinkage int sys_truncate64(const char *path, unsigned long high, + unsigned long low) +{ + if ((int)high < 0) + return -EINVAL; + return sys_truncate(path, (high << 32) | low); +} + +asmlinkage int sys_ftruncate64(unsigned int fd, unsigned long high, + unsigned long low) +{ + if ((int)high < 0) + return -EINVAL; + return sys_ftruncate(fd, (high << 32) | low); +} + +asmlinkage int sys_stat64(char * filename, struct stat *statbuf) +{ + return sys_newstat(filename, statbuf); +} + +asmlinkage int sys_lstat64(char * filename, struct stat *statbuf) +{ + return sys_newlstat(filename, statbuf); +} + +asmlinkage int sys_fstat64(unsigned int fd, struct stat *statbuf) +{ + return sys_fstat(fd, statbuf); +} diff --git a/include/asm-mips64/posix_types.h b/include/asm-mips64/posix_types.h index 94d973f65..2de3064c1 100644 --- a/include/asm-mips64/posix_types.h +++ b/include/asm-mips64/posix_types.h @@ -1,4 +1,4 @@ -/* $Id: posix_types.h,v 1.3 2000/02/04 23:32:54 ralf Exp $ +/* $Id: posix_types.h,v 1.4 2000/02/16 01:07:49 ralf Exp $ * * This file is subject to the terms and conditions of the GNU General Public * License. See the file "COPYING" in the main directory of this archive @@ -45,6 +45,25 @@ typedef __kernel_gid_t __kernel_old_gid_t; typedef long long __kernel_loff_t; #endif +/* Now 32bit compatibility types */ +typedef unsigned int __kernel_dev_t32; +typedef unsigned int __kernel_ino_t32; +typedef unsigned int __kernel_mode_t32; +typedef unsigned int __kernel_nlink_t32; +typedef int __kernel_off_t32; +typedef int __kernel_pid_t32; +typedef int __kernel_ipc_pid_t32; +typedef int __kernel_uid_t32; +typedef int __kernel_gid_t32; +typedef unsigned int __kernel_size_t32; +typedef int __kernel_ssize_t32; +typedef int __kernel_ptrdiff_t32; +typedef int __kernel_time_t32; +typedef int __kernel_suseconds_t32; +typedef int __kernel_clock_t32; +typedef int __kernel_daddr_t32; +typedef char * __kernel_caddr_t32; + typedef struct { int val[2]; } __kernel_fsid_t; diff --git a/include/asm-mips64/stat.h b/include/asm-mips64/stat.h index f42ef7293..8fdcd95d4 100644 --- a/include/asm-mips64/stat.h +++ b/include/asm-mips64/stat.h @@ -28,6 +28,32 @@ struct __old_kernel_stat { unsigned int st_gen; }; +struct stat32 { + __kernel_dev_t32 st_dev; + int st_pad1[3]; + __kernel_ino_t32 st_ino; + __kernel_mode_t32 st_mode; + __kernel_nlink_t32 st_nlink; + __kernel_uid_t32 st_uid; + __kernel_gid_t32 st_gid; + __kernel_dev_t32 st_rdev; + int st_pad2[2]; + __kernel_off_t32 st_size; + int st_pad3; + __kernel_time_t32 st_atime; + int reserved0; + __kernel_time_t32 st_mtime; + int reserved1; + __kernel_time_t32 st_ctime; + int reserved2; + int st_blksize; + int st_blocks; + char st_fstype[16]; /* Filesystem type name */ + int st_pad4[8]; + unsigned int st_flags; + unsigned int st_gen; +}; + struct stat { dev_t st_dev; long st_pad1[3]; /* Reserved for network id */ |