14 files changed, 772 insertions, 452 deletions

diff --git a/Documentation/filesystems/9p.txt b/Documentation/filesystems/9p.txt
index 13de64c7f0ab..2c0321442845 100644
--- a/Documentation/filesystems/9p.txt
+++ b/Documentation/filesystems/9p.txt
@@ -92,7 +92,7 @@ OPTIONS
 
   wfdno=n       the file descriptor for writing with trans=fd
 
-  maxdata=n     the number of bytes to use for 9p packet payload (msize)
+  msize=n       the number of bytes to use for 9p packet payload
 
   port=n        port to connect to on the remote server
 
diff --git a/fs/9p/v9fs.c b/fs/9p/v9fs.c
index ef9661886112..2b78014a124a 100644
--- a/fs/9p/v9fs.c
+++ b/fs/9p/v9fs.c
@@ -132,21 +132,19 @@ static int v9fs_parse_options(struct v9fs_session_info *v9ses, char *opts)
         options = tmp_options;
 
         while ((p = strsep(&options, ",")) != NULL) {
-                int token;
+                int token, r;
                 if (!*p)
                         continue;
                 token = match_token(p, tokens, args);
-                if (token < Opt_uname) {
-                        int r = match_int(&args[0], &option);
+                switch (token) {
+                case Opt_debug:
+                        r = match_int(&args[0], &option);
                         if (r < 0) {
                                 P9_DPRINTK(P9_DEBUG_ERROR,
-                                        "integer field, but no integer?\n");
+                                           "integer field, but no integer?\n");
                                 ret = r;
                                 continue;
                         }
-                }
-                switch (token) {
-                case Opt_debug:
                         v9ses->debug = option;
 #ifdef CONFIG_NET_9P_DEBUG
                         p9_debug_level = option;
@@ -154,12 +152,33 @@ static int v9fs_parse_options(struct v9fs_session_info *v9ses, char *opts)
                         break;
 
                 case Opt_dfltuid:
+                        r = match_int(&args[0], &option);
+                        if (r < 0) {
+                                P9_DPRINTK(P9_DEBUG_ERROR,
+                                           "integer field, but no integer?\n");
+                                ret = r;
+                                continue;
+                        }
                         v9ses->dfltuid = option;
                         break;
                 case Opt_dfltgid:
+                        r = match_int(&args[0], &option);
+                        if (r < 0) {
+                                P9_DPRINTK(P9_DEBUG_ERROR,
+                                           "integer field, but no integer?\n");
+                                ret = r;
+                                continue;
+                        }
                         v9ses->dfltgid = option;
                         break;
                 case Opt_afid:
+                        r = match_int(&args[0], &option);
+                        if (r < 0) {
+                                P9_DPRINTK(P9_DEBUG_ERROR,
+                                           "integer field, but no integer?\n");
+                                ret = r;
+                                continue;
+                        }
                         v9ses->afid = option;
                         break;
                 case Opt_uname:
diff --git a/fs/9p/vfs_dir.c b/fs/9p/vfs_dir.c
index 9c2bdda5cd9d..598fff1a54e5 100644
--- a/fs/9p/vfs_dir.c
+++ b/fs/9p/vfs_dir.c
@@ -165,9 +165,8 @@ static int v9fs_dir_readdir(struct file *filp, void *dirent, filldir_t filldir)
                 }
                 while (rdir->head < rdir->tail) {
                         p9stat_init(&st);
-                        err = p9stat_read(rdir->buf + rdir->head,
-                                                rdir->tail - rdir->head, &st,
-                                                fid->clnt->proto_version);
+                        err = p9stat_read(fid->clnt, rdir->buf + rdir->head,
+                                          rdir->tail - rdir->head, &st);
                         if (err) {
                                 P9_DPRINTK(P9_DEBUG_VFS, "returned %d\n", err);
                                 err = -EIO;
@@ -231,7 +230,7 @@ static int v9fs_dir_readdir_dotl(struct file *filp, void *dirent,
         while (err == 0) {
                 if (rdir->tail == rdir->head) {
                         err = p9_client_readdir(fid, rdir->buf, buflen,
-                                                                filp->f_pos);
+                                                filp->f_pos);
                         if (err <= 0)
                                 goto unlock_and_exit;
 
@@ -241,10 +240,9 @@ static int v9fs_dir_readdir_dotl(struct file *filp, void *dirent,
 
                 while (rdir->head < rdir->tail) {
 
-                        err = p9dirent_read(rdir->buf + rdir->head,
-                                                rdir->tail - rdir->head,
-                                                &curdirent,
-                                                fid->clnt->proto_version);
+                        err = p9dirent_read(fid->clnt, rdir->buf + rdir->head,
+                                            rdir->tail - rdir->head,
+                                            &curdirent);
                         if (err < 0) {
                                 P9_DPRINTK(P9_DEBUG_VFS, "returned %d\n", err);
                                 err = -EIO;
diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
index e3c03db3c788..b5a1076aaa6c 100644
--- a/fs/9p/vfs_inode.c
+++ b/fs/9p/vfs_inode.c
@@ -278,10 +278,8 @@ int v9fs_init_inode(struct v9fs_session_info *v9ses,
         case S_IFSOCK:
                 if (v9fs_proto_dotl(v9ses)) {
                         inode->i_op = &v9fs_file_inode_operations_dotl;
-                        inode->i_fop = &v9fs_file_operations_dotl;
                 } else if (v9fs_proto_dotu(v9ses)) {
                         inode->i_op = &v9fs_file_inode_operations;
-                        inode->i_fop = &v9fs_file_operations;
                 } else {
                         P9_DPRINTK(P9_DEBUG_ERROR,
                                    "special files without extended mode\n");
diff --git a/include/net/9p/9p.h b/include/net/9p/9p.h
index a6326ef8ade6..2d70b95b3b55 100644
--- a/include/net/9p/9p.h
+++ b/include/net/9p/9p.h
@@ -76,11 +76,8 @@ do {  \
         } \
 } while (0)
 
-#define P9_DUMP_PKT(way, pdu) p9pdu_dump(way, pdu)
-
 #else
 #define P9_DPRINTK(level, format, arg...)  do { } while (0)
-#define P9_DUMP_PKT(way, pdu) do { } while (0)
 #endif
 
 
@@ -359,6 +356,9 @@ enum p9_qid_t {
 /* Room for readdir header */
 #define P9_READDIRHDRSZ 24
 
+/* size of header for zero copy read/write */
+#define P9_ZC_HDR_SZ 4096
+
 /**
  * struct p9_qid - file system entity information
  * @type: 8-bit type &p9_qid_t
@@ -555,10 +555,6 @@ struct p9_rstatfs {
  * @tag: transaction id of the request
  * @offset: used by marshalling routines to track current position in buffer
  * @capacity: used by marshalling routines to track total malloc'd capacity