ceph: mount fails immediately on error
Signed-off-by: Yehuda Sadeh <yehuda@newdream.net>
This commit is contained in:
parent
94045e115e
commit
dc14657c9c
@ -169,6 +169,11 @@ int ceph_handle_auth_reply(struct ceph_auth_client *ac,
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (ac->negotiating) {
|
if (ac->negotiating) {
|
||||||
|
/* server does not support our protocols? */
|
||||||
|
if (!protocol && result < 0) {
|
||||||
|
ret = result;
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
/* set up (new) protocol handler? */
|
/* set up (new) protocol handler? */
|
||||||
if (ac->protocol && ac->protocol != protocol) {
|
if (ac->protocol && ac->protocol != protocol) {
|
||||||
ac->ops->destroy(ac);
|
ac->ops->destroy(ac);
|
||||||
|
@ -712,10 +712,14 @@ static int ceph_mount(struct ceph_client *client, struct vfsmount *mnt,
|
|||||||
/* wait */
|
/* wait */
|
||||||
dout("mount waiting for mon_map\n");
|
dout("mount waiting for mon_map\n");
|
||||||
err = wait_event_interruptible_timeout(client->mount_wq, /* FIXME */
|
err = wait_event_interruptible_timeout(client->mount_wq, /* FIXME */
|
||||||
have_mon_map(client),
|
have_mon_map(client) || (client->mount_err < 0),
|
||||||
timeout);
|
timeout);
|
||||||
if (err == -EINTR || err == -ERESTARTSYS)
|
if (err == -EINTR || err == -ERESTARTSYS)
|
||||||
goto out;
|
goto out;
|
||||||
|
if (client->mount_err < 0) {
|
||||||
|
err = client->mount_err;
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
dout("mount opening root\n");
|
dout("mount opening root\n");
|
||||||
|
Loading…
Reference in New Issue
Block a user