From 4dc47622cd86385271d6fb757334c404c1dfb047 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Fri, 17 Jun 2011 09:50:44 -0400
Subject: [PATCH] --- yaml --- r: 254044 b: refs/heads/master c:
 fa18f1bdce898f0efd0c8639c901d826d01be04f h: refs/heads/master v: v3

---
 [refs]                 |  2 +-
 trunk/fs/cifs/cifsfs.c | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 91734292abca..28b903f8b862 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee01a14d9ddcf3f832f9ceb837888501cb496e27
+refs/heads/master: fa18f1bdce898f0efd0c8639c901d826d01be04f
diff --git a/trunk/fs/cifs/cifsfs.c b/trunk/fs/cifs/cifsfs.c
index ba2b2da360d3..234e9d08db76 100644
--- a/trunk/fs/cifs/cifsfs.c
+++ b/trunk/fs/cifs/cifsfs.c
@@ -710,19 +710,16 @@ cifs_do_mount(struct file_system_type *fs_type,
 
 	sb->s_flags |= MS_ACTIVE;
 
+out_shared:
 	root = cifs_get_root(volume_info, sb);
-	if (root == NULL)
+	if (root == NULL) {
+		root = ERR_PTR(-EINVAL); /* XXX */
 		goto out_super;
+	}
 
 	cFYI(1, "dentry root is: %p", root);
 	goto out;
 
-out_shared:
-	root = cifs_get_root(volume_info, sb);
-	if (root)
-		cFYI(1, "dentry root is: %p", root);
-	goto out;
-
 out_super:
 	deactivate_locked_super(sb);
 out: