7 files changed, 157 insertions, 58 deletions

diff --git a/fs/9p/v9fs.c b/fs/9p/v9fs.c
index 047c791427aa..24eb01087b6d 100644
--- a/fs/9p/v9fs.c
+++ b/fs/9p/v9fs.c
@@ -30,8 +30,8 @@
 #include <linux/parser.h>
 #include <linux/idr.h>
 #include <net/9p/9p.h>
-#include <net/9p/transport.h>
 #include <net/9p/client.h>
+#include <net/9p/transport.h>
 #include "v9fs.h"
 #include "v9fs_vfs.h"
 
@@ -55,7 +55,7 @@ enum {
         Opt_err
 };
 
-static match_table_t tokens = {
+static const match_table_t tokens = {
         {Opt_debug, "debug=%x"},
         {Opt_dfltuid, "dfltuid=%u"},
         {Opt_dfltgid, "dfltgid=%u"},
@@ -234,7 +234,7 @@ struct p9_fid *v9fs_session_init(struct v9fs_session_info *v9ses,
         if (!v9ses->clnt->dotu)
                 v9ses->flags &= ~V9FS_EXTENDED;
 
-        v9ses->maxdata = v9ses->clnt->msize;
+        v9ses->maxdata = v9ses->clnt->msize - P9_IOHDRSZ;
 
         /* for legacy mode, fall back to V9FS_ACCESS_ANY */
         if (!v9fs_extended(v9ses) &&
diff --git a/fs/9p/v9fs_vfs.h b/fs/9p/v9fs_vfs.h
index 57997fa14e69..c295ba786edd 100644
--- a/fs/9p/v9fs_vfs.h
+++ b/fs/9p/v9fs_vfs.h
@@ -46,9 +46,11 @@ extern struct dentry_operations v9fs_cached_dentry_operations;
 
 struct inode *v9fs_get_inode(struct super_block *sb, int mode);
 ino_t v9fs_qid2ino(struct p9_qid *qid);
-void v9fs_stat2inode(struct p9_stat *, struct inode *, struct super_block *);
+void v9fs_stat2inode(struct p9_wstat *, struct inode *, struct super_block *);
 int v9fs_dir_release(struct inode *inode, struct file *filp);
 int v9fs_file_open(struct inode *inode, struct file *file);
-void v9fs_inode2stat(struct inode *inode, struct p9_stat *stat);
+void v9fs_inode2stat(struct inode *inode, struct p9_wstat *stat);
 void v9fs_dentry_release(struct dentry *);
 int v9fs_uflags2omode(int uflags, int extended);
+
+ssize_t v9fs_file_readn(struct file *, char *, char __user *, u32, u64);
diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c
index 97d3aed57983..6fcb1e7095cf 100644
--- a/fs/9p/vfs_addr.c
+++ b/fs/9p/vfs_addr.c
@@ -38,7 +38,6 @@
 
 #include "v9fs.h"
 #include "v9fs_vfs.h"
-#include "fid.h"
 
 /**
  * v9fs_vfs_readpage - read an entire page in from 9P
@@ -53,14 +52,12 @@ static int v9fs_vfs_readpage(struct file *filp, struct page *page)
         int retval;
         loff_t offset;
         char *buffer;
-        struct p9_fid *fid;
 
         P9_DPRINTK(P9_DEBUG_VFS, "\n");
-        fid = filp->private_data;
         buffer = kmap(page);
         offset = page_offset(page);
 
-        retval = p9_client_readn(fid, buffer, offset, PAGE_CACHE_SIZE);
+        retval = v9fs_file_readn(filp, buffer, NULL, offset, PAGE_CACHE_SIZE);
         if (retval < 0)
                 goto done;
 
diff --git a/fs/9p/vfs_dir.c b/fs/9p/vfs_dir.c
index e298fe194093..873cd31baa47 100644
--- a/fs/9p/vfs_dir.c
+++ b/fs/9p/vfs_dir.c
@@ -45,7 +45,7 @@
  *
  */
 
-static inline int dt_type(struct p9_stat *mistat)
+static inline int dt_type(struct p9_wstat *mistat)
 {
         unsigned long perm = mistat->mode;
         int rettype = DT_REG;
@@ -69,32 +69,58 @@ static inline int dt_type(struct p9_stat *mistat)
 static int v9fs_dir_readdir(struct file *filp, void *dirent, filldir_t filldir)
 {
         int over;
+        struct p9_wstat st;
+        int err;
         struct p9_fid *fid;
-        struct v9fs_session_info *v9ses;
-        struct inode *inode;
-        struct p9_stat *st;
+        int buflen;
+        char *statbuf;
+        int n, i = 0;
 
         P9_DPRINTK(P9_DEBUG_VFS, "name %s\n", filp->f_path.dentry->d_name.name);
-        inode = filp->f_path.dentry->d_inode;
-        v9ses = v9fs_inode2v9ses(inode);
         fid = filp->private_data;
-        while ((st = p9_client_dirread(fid, filp->f_pos)) != NULL) {
-                if (IS_ERR(st))
-                        return PTR_ERR(st);
 
-                over = filldir(dirent, st->name.str, st->name.len, filp->f_pos,
-                        v9fs_qid2ino(&st->qid), dt_type(st));
+        buflen = fid->clnt->msize - P9_IOHDRSZ;
+        statbuf = kmalloc(buflen, GFP_KERNEL);
+        if (!statbuf)
+                return -ENOMEM;
 
-                if (over)
+        while (1) {
+                err = v9fs_file_readn(filp, statbuf, NULL, buflen,
+                                                                fid->rdir_fpos);
+                if (err <= 0)
                         break;
 
-                filp->f_pos += st->size;
-                kfree(st);
-                st = NULL;
+                n = err;
+                while (i < n) {
+                        err = p9stat_read(statbuf + i, buflen-i, &st,
+                                                        fid->clnt->dotu);
+                        if (err) {
+                                P9_DPRINTK(P9_DEBUG_VFS, "returned %d\n", err);
+                                err = -EIO;
+                                p9stat_free(&st);
+                                goto free_and_exit;
+                        }
+
+                        i += st.size+2;
+                        fid->rdir_fpos += st.size+2;
+
+                        over = filldir(dirent, st.name, strlen(st.name),
+                            filp->f_pos, v9fs_qid2ino(&st.qid), dt_type(&st));
+
+                        filp->f_pos += st.size+2;
+
+                        p9stat_free(&st);
+
+                        if (over) {
+                                err = 0;
+                                goto free_and_exit;
+                        }
+                }
         }
 
-        kfree(st);
-        return 0;
+free_and_exit:
+        kfree(statbuf);
+        return err;
 }
 
 
diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c
index 52944d2249a4..041c52692284 100644
--- a/fs/9p/vfs_file.c
+++ b/fs/9p/vfs_file.c
@@ -120,23 +120,72 @@ static int v9fs_file_lock(struct file *filp, int cmd, struct file_lock *fl)
 }
 
 /**
- * v9fs_file_read - read from a file
+ * v9fs_file_readn - read from a file
  * @filp: file pointer to read
  * @data: data buffer to read data into
+ * @udata: user data buffer to read data into
  * @count: size of buffer
  * @offset: offset at which to read data
  *
  */
+
+ssize_t
+v9fs_file_readn(struct file *filp, char *data, char __user *udata, u32 count,
+               u64 offset)
+{
+        int n, total;
+        struct p9_fid *fid = filp->private_data;
+
+        P9_DPRINTK(P9_DEBUG_VFS, "fid %d offset %llu count %d\n", fid->fid,
+                                        (long long unsigned) offset, count);
+
+        n = 0;
+        total = 0;
+        do {
+                n = p9_client_read(fid, data, udata, offset, count);
+                if (n <= 0)
+                        break;
+
+                if (data)
+                        data += n;
+                if (udata)
+                        udata += n;
+
+                offset += n;
+                count -= n;
+                total += n;
+        } while (count > 0 && n == (fid->clnt->msize - P9_IOHDRSZ));
+
+        if (n < 0)
+                total = n;
+
+        return total;
+}
+
+/**
+ * v9fs_file_read - read from a file
+ * @filp: file pointer to read
+ * @udata: user data buffer to read data into
+ * @count: size of buffer
+ * @offset: offset at which to read data
+ *
+ */
+
 static ssize_t
-v9fs_file_read(struct file *filp, char __user * data, size_t count,
+v9fs_file_read(struct file *filp, char __user *udata, size_t count,
                loff_t * offset)
 {
         int ret;
         struct p9_fid *fid;
 
-        P9_DPRINTK(P9_DEBUG_VFS, "\n");
+        P9_DPRINTK(P9_DEBUG_VFS, "count %d offset %lld\n", count, *offset);
         fid = filp->private_data;
-        ret = p9_client_uread(fid, data, *offset, count);
+
+        if (count > (fid->clnt->msize - P9_IOHDRSZ))
+                ret = v9fs_file_readn(filp, NULL, udata, count, *offset);
+        else
+                ret = p9_client_read(fid, NULL, udata, *offset, count);
+
         if (ret > 0)
                 *offset += ret;
 
@@ -156,19 +205,38 @@ static ssize_t
 v9fs_file_write(struct file *filp, const char __user * data,
                 size_t count, loff_t * offset)
 {
-        int ret;
+        int n, rsize, total = 0;
         struct p9_fid *fid;
+        struct p9_client *clnt;
         struct inode *inode = filp->f_path.dentry->d_inode;
+        int origin = *offset;
 
         P9_DPRINTK(P9_DEBUG_VFS, "data %p count %d offset %x\n", data,
                 (int)count, (int)*offset);
 
         fid = filp->private_data;
-        ret = p9_client_uwrite(fid, data, *offset, count);
-        if (ret > 0) {
-                invalidate_inode_pages2_range(inode->i_mapping, *offset,
-                                                                *offset+ret);
-                *offset += ret;
+        clnt = fid->clnt;
+
+        rsize = fid->iounit;
+        if (!rsize || rsize > clnt->msize-P9_IOHDRSZ)
+                rsize = clnt->msize - P9_IOHDRSZ;
+
+        do {
+                if (count < rsize)
+                        rsize = count;
+
+                n = p9_client_write(fid, NULL, data+total, *offset+total,
+                                                                        rsize);
+                if (n <= 0)
+                        break;
+                count -= n;
+                total += n;
+        } while (count > 0);
+
+        if (total > 0) {
+                invalidate_inode_pages2_range(inode->i_mapping, origin,
+                                                                origin+total);
+                *offset += total;
         }
 
         if (*offset > inode->i_size) {
@@ -176,7 +244,10 @@ v9fs_file_write(struct file *filp, const char __user * data,
                 inode->i_blocks = (inode->i_size + 512 - 1) >> 9;
         }
 
-        return ret;
+        if (n < 0)
+                return n;
+
+        return total;
 }
 
 static const struct file_operations v9fs_cached_file_operations = {
diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
index e83aa5ebe861..8314d3f43b71 100644
--- a/fs/9p/vfs_inode.c
+++ b/fs/9p/vfs_inode.c
@@ -334,7 +334,7 @@ v9fs_inode_from_fid(struct v9fs_session_info *v9ses, struct p9_fid *fid,
 {
         int err, umode;
         struct inode *ret;
-        struct p9_stat *st;
+        struct p9_wstat *st;
 
         ret = NULL;
         st = p9_client_stat(fid);
@@ -417,6 +417,8 @@ v9fs_create(struct v9fs_session_info *v9ses, struct inode *dir,
         struct p9_fid *dfid, *ofid, *fid;
         struct inode *inode;
 
+        P9_DPRINTK(P9_DEBUG_VFS, "name %s\n", dentry->d_name.name);
+
         err = 0;
         ofid = NULL;
         fid = NULL;
@@ -424,6 +426,7 @@ v9fs_create(struct v9fs_session_info *v9ses, struct inode *dir,
         dfid = v9fs_fid_clone(dentry->d_parent);
         if (IS_ERR(dfid)) {
                 err = PTR_ERR(dfid);
+                P9_DPRINTK(P9_DEBUG_VFS, "fid clone failed %d\n", err);
                 dfid = NULL;
                 goto error;
         }
@@ -432,18 +435,22 @@ v9fs_create(struct v9fs_session_info *v9ses, struct inode *dir,
         ofid = p9_client_walk(dfid, 0, NULL, 1);
         if (IS_ERR(ofid)) {
                 err = PTR_ERR(ofid);
+                P9_DPRINTK(P9_DEBUG_VFS, "p9_client_walk failed %d\n", err);
                 ofid = NULL;
                 goto error;
         }
 
         err = p9_client_fcreate(ofid, name, perm, mode, extension);
-        if (err < 0)
+        if (err < 0) {
+                P9_DPRINTK(P9_DEBUG_VFS, "p9_client_fcreate failed %d\n", err);
                 goto error;
+        }
 
         /* now walk from the parent so we can get unopened fid */
         fid = p9_client_walk(dfid, 1, &name, 0);
         if (IS_ERR(fid)) {
                 err = PTR_ERR(fid);
+                P9_DPRINTK(P9_DEBUG_VFS, "p9_client_walk failed %d\n", err);
                 fid = NULL;
                 goto error;
         } else
@@ -453,6 +460,7 @@ v9fs_create(struct v9fs_session_info *v9ses, struct inode *dir,
         inode = v9fs_inode_from_fid(v9ses, fid, dir->i_sb);
         if (IS_ERR(inode)) {
                 err = PTR_ERR(inode);
+                P9_DPRINTK(P9_DEBUG_VFS, "inode creation failed %d\n", err);
                 goto error;
         }
 
@@ -734,7 +742,7 @@ v9fs_vfs_getattr(struct vfsmount *mnt, struct dentry *dentry,
         int err;
         struct v9fs_session_info *v9ses;
         struct p9_fid *fid;
-        struct p9_stat *st;
+        struct p9_wstat *st;
 
         P9_DPRINTK(P9_DEBUG_VFS, "dentry: %p\n", dentry);
         err = -EPERM;
@@ -815,10 +823,9 @@ static int v9fs_vfs_setattr(struct dentry *dentry, struct iattr *iattr)
  */
 
 void
-v9fs_stat2inode(struct p9_stat *stat, struct inode *inode,
+v9fs_stat2inode(struct p9_wstat *stat, struct inode *inode,
         struct super_block *sb)
 {
-        int n;
         char ext[32];
         struct v9fs_session_info *v9ses = sb->s_fs_info;
 
@@ -842,11 +849,7 @@ v9fs_stat2inode(struct p9_stat *stat, struct inode *inode,
                 int major = -1;
                 int minor = -1;
 
-                n = stat->extension.len;
-                if (n > sizeof(ext)-1)
-                        n = sizeof(ext)-1;
-                memmove(ext, stat->extension.str, n);
-                ext[n] = 0;
+                strncpy(ext, stat->extension, sizeof(ext));
                 sscanf(ext, "%c %u %u", &type, &major, &minor);
                 switch (type) {
                 case 'c':
@@ -857,10 +860,11 @@ v9fs_stat2inode(struct p9_stat *stat, struct inode *inode,
                         break;
                 default:
                         P9_DPRINTK(P9_DEBUG_ERROR,
-                                "Unknown special type %c (%.*s)\n", type,
-                                stat->extension.len, stat->extension.str);
+                                "Unknown special type %c %s\n", type,
+                                stat->extension);
                 };
                 inode->i_rdev = MKDEV(major, minor);
+                init_special_inode(inode, inode->i_mode, inode->i_rdev);
         } else
                 inode->i_rdev = 0;
 
@@ -904,7 +908,7 @@ static int v9fs_readlink(struct dentry *dentry, char *buffer, int buflen)
 
         struct v9fs_session_info *v9ses;
         struct p9_fid *fid;
-        struct p9_stat *st;
+        struct p9_wstat *st;
 
         P9_DPRINTK(P9_DEBUG_VFS, " %s\n", dentry->d_name.name);
         retval = -EPERM;
@@ -926,15 +930,10 @@ static int v9fs_readlink(struct dentry *dentry, char *buffer, int buflen)
         }
 
         /* copy extension buffer into buffer */
-        if (st->extension.len < buflen)
-                buflen = st->extension.len + 1;
-
-        memmove(buffer, st->extension.str, buflen - 1);
-        buffer[buflen-1] = 0;
+        strncpy(buffer, st->extension, buflen);
 
         P9_DPRINTK(P9_DEBUG_VFS,
-                "%s -> %.*s (%s)\n", dentry->d_name.name, st->extension.len,
-                st->extension.str, buffer);
+                "%s -> %s (%s)\n", dentry->d_name.name, st->extension, buffer);
 
         retval = buflen;
 
diff --git a/fs/9p/vfs_super.c b/fs/9p/vfs_super.c
index bf59c3960494..d6cb1a0ca724 100644
--- a/fs/9p/vfs_super.c
+++ b/fs/9p/vfs_super.c
@@ -111,7 +111,7 @@ static int v9fs_get_sb(struct file_system_type *fs_type, int flags,
         struct inode *inode = NULL;
         struct dentry *root = NULL;
         struct v9fs_session_info *v9ses = NULL;
-        struct p9_stat *st = NULL;
+        struct p9_wstat *st = NULL;
         int mode = S_IRWXUGO | S_ISVTX;
         uid_t uid = current->fsuid;
         gid_t gid = current->fsgid;
@@ -161,10 +161,14 @@ static int v9fs_get_sb(struct file_system_type *fs_type, int flags,
 
         sb->s_root = root;
         root->d_inode->i_ino = v9fs_qid2ino(&st->qid);
+
         v9fs_stat2inode(st, root->d_inode, sb);
+
         v9fs_fid_add(root, fid);
+        p9stat_free(st);
         kfree(st);
 
+P9_DPRINTK(P9_DEBUG_VFS, " return simple set mount\n");
         return simple_set_mnt(mnt, sb);
 
 release_sb: