1 files changed, 15 insertions, 41 deletions

diff --git a/fs/compat.c b/fs/compat.c
index ce982f6e8c80..13fb08d096c4 100644
--- a/fs/compat.c
+++ b/fs/compat.c
@@ -44,7 +44,7 @@
 #include <linux/nfsd/syscall.h>
 #include <linux/personality.h>
 #include <linux/rwsem.h>
-#include <linux/acct.h>
+#include <linux/tsacct_kern.h>
 #include <linux/mm.h>
 
 #include <net/sock.h>           /* siocdevprivate_ioctl */
@@ -52,11 +52,12 @@
 #include <asm/uaccess.h>
 #include <asm/mmu_context.h>
 #include <asm/ioctls.h>
-
-extern void sigset_from_compat(sigset_t *set, compat_sigset_t *compat);
+#include "internal.h"
 
 int compat_log = 1;
 
+extern void sigset_from_compat(sigset_t *set, compat_sigset_t *compat);
+
 int compat_printk(const char *fmt, ...)
 {
         va_list ap;
@@ -69,6 +70,8 @@ int compat_printk(const char *fmt, ...)
         return ret;
 }
 
+#include "read_write.h"
+
 /*
  * Not all architectures have sys_utime, so implement this in terms
  * of sys_utimes.
@@ -313,9 +316,6 @@ out:
 #define IOCTL_HASHSIZE 256
 static struct ioctl_trans *ioctl32_hash_table[IOCTL_HASHSIZE];
 
-extern struct ioctl_trans ioctl_start[];
-extern int ioctl_table_size;
-
 static inline unsigned long ioctl32_hash(unsigned long cmd)
 {
         return (((cmd >> 6) ^ (cmd >> 4) ^ cmd)) % IOCTL_HASHSIZE;
@@ -838,8 +838,6 @@ static int do_nfs4_super_data_conv(void *raw_data)
         return 0;
 }
 
-extern int copy_mount_options (const void __user *, unsigned long *);
-
 #define SMBFS_NAME      "smbfs"
 #define NCPFS_NAME      "ncpfs"
 #define NFS4_NAME       "nfs4"
@@ -1153,9 +1151,6 @@ static ssize_t compat_do_readv_writev(int type, struct file *file,
                                const struct compat_iovec __user *uvector,
                                unsigned long nr_segs, loff_t *pos)
 {
-        typedef ssize_t (*io_fn_t)(struct file *, char __user *, size_t, loff_t *);
-        typedef ssize_t (*iov_fn_t)(struct file *, const struct iovec *, unsigned long, loff_t *);
-
         compat_ssize_t tot_len;
         struct iovec iovstack[UIO_FASTIOV];
         struct iovec *iov=iovstack, *vector;
@@ -1238,39 +1233,18 @@ static ssize_t compat_do_readv_writev(int type, struct file *file,
         fnv = NULL;
         if (type == READ) {
                 fn = file->f_op->read;
-                fnv = file->f_op->readv;
+                fnv = file->f_op->aio_read;
         } else {
                 fn = (io_fn_t)file->f_op->write;
-                fnv = file->f_op->writev;
-        }
-        if (fnv) {
-                ret = fnv(file, iov, nr_segs, pos);
-                goto out;
+                fnv = file->f_op->aio_write;
         }
 
-        /* Do it by hand, with file-ops */
-        ret = 0;
-        vector = iov;
-        while (nr_segs > 0) {
-                void __user * base;
-                size_t len;
-                ssize_t nr;
-
-                base = vector->iov_base;
-                len = vector->iov_len;
-                vector++;
-                nr_segs--;
-
-                nr = fn(file, base, len, pos);
+        if (fnv)
+                ret = do_sync_readv_writev(file, iov, nr_segs, tot_len,
+                                                pos, fnv);
+        else
+                ret = do_loop_readv_writev(file, iov, nr_segs, pos, fn);
 
-                if (nr < 0) {
-                        if (!ret) ret = nr;
-                        break;
-                }
-                ret += nr;
-                if (nr != len)
-                        break;
-        }
 out:
         if (iov != iovstack)
                 kfree(iov);
@@ -1298,7 +1272,7 @@ compat_sys_readv(unsigned long fd, const struct compat_iovec __user *vec, unsign
                 goto out;
 
         ret = -EINVAL;
-        if (!file->f_op || (!file->f_op->readv && !file->f_op->read))
+        if (!file->f_op || (!file->f_op->aio_read && !file->f_op->read))
                 goto out;
 
         ret = compat_do_readv_writev(READ, file, vec, vlen, &file->f_pos);
@@ -1321,7 +1295,7 @@ compat_sys_writev(unsigned long fd, const struct compat_iovec __user *vec, unsig
                 goto out;
 
         ret = -EINVAL;
-        if (!file->f_op || (!file->f_op->writev && !file->f_op->write))
+        if (!file->f_op || (!file->f_op->aio_write && !file->f_op->write))
                 goto out;
 
         ret = compat_do_readv_writev(WRITE, file, vec, vlen, &file->f_pos);