aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/cifs/cifsfs.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index ba2b2da360d..234e9d08db7 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -710,19 +710,16 @@ cifs_do_mount(struct file_system_type *fs_type,
710 710
711 sb->s_flags |= MS_ACTIVE; 711 sb->s_flags |= MS_ACTIVE;
712 712
713out_shared:
713 root = cifs_get_root(volume_info, sb); 714 root = cifs_get_root(volume_info, sb);
714 if (root == NULL) 715 if (root == NULL) {
716 root = ERR_PTR(-EINVAL); /* XXX */
715 goto out_super; 717 goto out_super;
718 }
716 719
717 cFYI(1, "dentry root is: %p", root); 720 cFYI(1, "dentry root is: %p", root);
718 goto out; 721 goto out;
719 722
720out_shared:
721 root = cifs_get_root(volume_info, sb);
722 if (root)
723 cFYI(1, "dentry root is: %p", root);
724 goto out;
725
726out_super: 723out_super:
727 deactivate_locked_super(sb); 724 deactivate_locked_super(sb);
728out: 725out: