9p: rework client code to use new protocol support functions

Now that the new protocol functions are in place, this patch switches
the client code to using the new support code.

Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>

1 files changed, 18 insertions, 20 deletions

diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
index e83aa5ebe86..e96d84aafbe 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,8 +860,8 @@ 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);
         } else
@@ -904,7 +907,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 +929,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;