From: Sage Weil <sage@newdream.net>
Date: Fri, 6 Jun 2008 17:08:57 +0000 (-0700)
Subject: kclient: fix mount failure unwinding
X-Git-Tag: v0.3~154
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=be22b3eb1dee789b13cb3461e4b5f2edf45434fb;p=ceph.git

kclient: fix mount failure unwinding
---

diff --git a/src/kernel/super.c b/src/kernel/super.c
index 25e219154433..17646b0945e9 100644
--- a/src/kernel/super.c
+++ b/src/kernel/super.c
@@ -692,7 +692,7 @@ int ceph_mount(struct ceph_client *client, struct vfsmount *mnt)
 	struct ceph_msg *mount_msg;
 	struct dentry *root;
 	int err;
-	int attempts = 10;
+	int attempts = 2;//10;
 	int which;
 	char r;
 
@@ -939,8 +939,10 @@ static int ceph_get_sb(struct file_system_type *fs_type,
 out_splat:
 	up_write(&sb->s_umount);
 	deactivate_super(sb);
+	goto out_final;
 out:
 	ceph_destroy_client(client);
+out_final:
 	dout(25, "ceph_get_sb fail %d\n", err);
 	return err;
 }