1 files changed, 37 insertions, 54 deletions

diff --git a/fs/9p/vfs_super.c b/fs/9p/vfs_super.c
index 7bdf8b326841..f6a0519ade8c 100644
--- a/fs/9p/vfs_super.c
+++ b/fs/9p/vfs_super.c
@@ -37,10 +37,10 @@
 #include <linux/mount.h>
 #include <linux/idr.h>
 #include <linux/sched.h>
+#include <net/9p/9p.h>
+#include <net/9p/client.h>
 
-#include "debug.h"
 #include "v9fs.h"
-#include "9p.h"
 #include "v9fs_vfs.h"
 #include "fid.h"
 
@@ -107,41 +107,48 @@ static int v9fs_get_sb(struct file_system_type *fs_type, int flags,
                        struct vfsmount *mnt)
 {
         struct super_block *sb = NULL;
-        struct v9fs_fcall *fcall = NULL;
         struct inode *inode = NULL;
         struct dentry *root = NULL;
         struct v9fs_session_info *v9ses = NULL;
-        struct v9fs_fid *root_fid = NULL;
+        struct p9_stat *st = NULL;
         int mode = S_IRWXUGO | S_ISVTX;
         uid_t uid = current->fsuid;
         gid_t gid = current->fsgid;
-        int stat_result = 0;
-        int newfid = 0;
+        struct p9_fid *fid;
         int retval = 0;
 
-        dprintk(DEBUG_VFS, " \n");
+        P9_DPRINTK(P9_DEBUG_VFS, " \n");
 
         v9ses = kzalloc(sizeof(struct v9fs_session_info), GFP_KERNEL);
         if (!v9ses)
                 return -ENOMEM;
 
-        if ((newfid = v9fs_session_init(v9ses, dev_name, data)) < 0) {
-                dprintk(DEBUG_ERROR, "problem initiating session\n");
-                retval = newfid;
-                goto out_free_session;
+        fid = v9fs_session_init(v9ses, dev_name, data);
+        if (IS_ERR(fid)) {
+                retval = PTR_ERR(fid);
+                fid = NULL;
+                kfree(v9ses);
+                v9ses = NULL;
+                goto error;
+        }
+
+        st = p9_client_stat(fid);
+        if (IS_ERR(st)) {
+                retval = PTR_ERR(st);
+                goto error;
         }
 
         sb = sget(fs_type, NULL, v9fs_set_super, v9ses);
         if (IS_ERR(sb)) {
                 retval = PTR_ERR(sb);
-                goto out_close_session;
+                goto error;
         }
         v9fs_fill_super(sb, v9ses, flags);
 
         inode = v9fs_get_inode(sb, S_IFDIR | mode);
         if (IS_ERR(inode)) {
                 retval = PTR_ERR(inode);
-                goto put_back_sb;
+                goto error;
         }
 
         inode->i_uid = uid;
@@ -150,54 +157,30 @@ static int v9fs_get_sb(struct file_system_type *fs_type, int flags,
         root = d_alloc_root(inode);
         if (!root) {
                 retval = -ENOMEM;
-                goto put_back_sb;
+                goto error;
         }
 
         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);
 
-        stat_result = v9fs_t_stat(v9ses, newfid, &fcall);
-        if (stat_result < 0) {
-                dprintk(DEBUG_ERROR, "stat error\n");
-                v9fs_t_clunk(v9ses, newfid);
-        } else {
-                /* Setup the Root Inode */
-                root_fid = v9fs_fid_create(v9ses, newfid);
-                if (root_fid == NULL) {
-                        retval = -ENOMEM;
-                        goto put_back_sb;
-                }
-
-                retval = v9fs_fid_insert(root_fid, root);
-                if (retval < 0) {
-                        kfree(fcall);
-                        goto put_back_sb;
-                }
-
-                root_fid->qid = fcall->params.rstat.stat.qid;
-                root->d_inode->i_ino =
-                    v9fs_qid2ino(&fcall->params.rstat.stat.qid);
-                v9fs_stat2inode(&fcall->params.rstat.stat, root->d_inode, sb);
-        }
+        return simple_set_mnt(mnt, sb);
 
-        kfree(fcall);
+error:
+        if (fid)
+                p9_client_clunk(fid);
 
-        if (stat_result < 0) {
-                retval = stat_result;
-                goto put_back_sb;
+        if (v9ses) {
+                v9fs_session_close(v9ses);
+                kfree(v9ses);
         }
 
-        return simple_set_mnt(mnt, sb);
-
-out_close_session:
-        v9fs_session_close(v9ses);
-out_free_session:
-        kfree(v9ses);
-        return retval;
+        if (sb) {
+                up_write(&sb->s_umount);
+                deactivate_super(sb);
+        }
 
-put_back_sb:
-        /* deactivate_super calls v9fs_kill_super which will frees the rest */
-        up_write(&sb->s_umount);
-        deactivate_super(sb);
         return retval;
 }
 
@@ -211,7 +194,7 @@ static void v9fs_kill_super(struct super_block *s)
 {
         struct v9fs_session_info *v9ses = s->s_fs_info;
 
-        dprintk(DEBUG_VFS, " %p\n", s);
+        P9_DPRINTK(P9_DEBUG_VFS, " %p\n", s);
 
         v9fs_dentry_release(s->s_root); /* clunk root */
 
@@ -219,7 +202,7 @@ static void v9fs_kill_super(struct super_block *s)
 
         v9fs_session_close(v9ses);
         kfree(v9ses);
-        dprintk(DEBUG_VFS, "exiting kill_super\n");
+        P9_DPRINTK(P9_DEBUG_VFS, "exiting kill_super\n");
 }
 
 /**