From dc14657c9c946f25b84a98e9ffa41b812a70699e Mon Sep 17 00:00:00 2001
From: Yehuda Sadeh <yehuda@newdream.net>
Date: Fri, 20 Nov 2009 13:59:13 -0800
Subject: ceph: mount fails immediately on error
Signed-off-by: Yehuda Sadeh <yehuda@newdream.net>
---
fs/ceph/auth.c | 5 +++++
fs/ceph/super.c | 6 +++++-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/fs/ceph/auth.c b/fs/ceph/auth.c
index c4d1eee827a3..32f2e2a021ab 100644
--- a/fs/ceph/auth.c
+++ b/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/fs/ceph/super.c b/fs/ceph/super.c
index 3df6d4ab236c..a828943296c5 100644
--- a/fs/ceph/super.c
+++ b/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");
--
cgit v1.2.2