autofs4: collect version check return

[linux-2.6-omap-h63xx.git] / fs / 9p / vfs_super.c

diff --git a/fs/9p/vfs_super.c b/fs/9p/vfs_super.c
index ba10f172626d999ba9686d93e14c22745e861331..d6cb1a0ca724d772e2d8bec5093ea621bbe8d864 100644 (file)
--- 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;
@@ -128,29 +128,26 @@ static int v9fs_get_sb(struct file_system_type *fs_type, int flags,
        fid = v9fs_session_init(v9ses, dev_name, data);
        if (IS_ERR(fid)) {
                retval = PTR_ERR(fid);
-               fid = NULL;
-               kfree(v9ses);
-               v9ses = NULL;
-               goto error;
+               goto close_session;
        }
 
        st = p9_client_stat(fid);
        if (IS_ERR(st)) {
                retval = PTR_ERR(st);
-               goto error;
+               goto clunk_fid;
        }
 
        sb = sget(fs_type, NULL, v9fs_set_super, v9ses);
        if (IS_ERR(sb)) {
                retval = PTR_ERR(sb);
-               goto error;
+               goto free_stat;
        }
        v9fs_fill_super(sb, v9ses, flags);
 
        inode = v9fs_get_inode(sb, S_IFDIR | mode);
        if (IS_ERR(inode)) {
                retval = PTR_ERR(inode);
-               goto error;
+               goto release_sb;
        }
 
        inode->i_uid = uid;
@@ -159,32 +156,37 @@ static int v9fs_get_sb(struct file_system_type *fs_type, int flags,
        root = d_alloc_root(inode);
        if (!root) {
                retval = -ENOMEM;
-               goto error;
+               goto release_sb;
        }
 
        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);
 
-error:
-       kfree(st);
-       if (fid)
-               p9_client_clunk(fid);
-
-       if (v9ses) {
-               v9fs_session_close(v9ses);
-               kfree(v9ses);
-       }
-
+release_sb:
        if (sb) {
                up_write(&sb->s_umount);
                deactivate_super(sb);
        }
 
+free_stat:
+       kfree(st);
+
+clunk_fid:
+       p9_client_clunk(fid);
+
+close_session:
+       v9fs_session_close(v9ses);
+       kfree(v9ses);
+
        return retval;
 }