---

yaml --- r: 188628 b: refs/heads/master c: dc14657 h: refs/heads/master v: v3
git-mirror · Nov 20, 2009 · 7bc874f · 7bc874f
1 parent 9c552a8
commit 7bc874f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 94045e115ee72aee3b17295791da07078f2f778c
+refs/heads/master: dc14657c9c946f25b84a98e9ffa41b812a70699e
diff --git a/trunk/fs/ceph/auth.c b/trunk/fs/ceph/auth.c
@@ -169,6 +169,11 @@ int ceph_handle_auth_reply(struct ceph_auth_client *ac,
 	}
 
 	if (ac->negotiating) {
+		/* server does not support our protocols? */
+		if (!protocol && result < 0) {
+			ret = result;
+			goto out;
+		}
 		/* set up (new) protocol handler? */
 		if (ac->protocol && ac->protocol != protocol) {
 			ac->ops->destroy(ac);

diff --git a/trunk/fs/ceph/super.c b/trunk/fs/ceph/super.c
@@ -712,10 +712,14 @@ static int ceph_mount(struct ceph_client *client, struct vfsmount *mnt,
 		/* wait */
 		dout("mount waiting for mon_map\n");
 		err = wait_event_interruptible_timeout(client->mount_wq, /* FIXME */
-			       have_mon_map(client),
+			       have_mon_map(client) || (client->mount_err < 0),
 			       timeout);
 		if (err == -EINTR || err == -ERESTARTSYS)
 			goto out;
+		if (client->mount_err < 0) {
+			err = client->mount_err;
+			goto out;
+		}
 	}
 
 	dout("mount opening root\n");