luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ceph: mount fails immediately on error

Browse Source 
Signed-off-by: Yehuda Sadeh <yehuda@newdream.net>
This commit is contained in:
Yehuda Sadeh 2009-11-20 13:59:13 -08:00 committed by Sage Weil
parent 94045e115e
commit dc14657c9c
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fs/ceph/auth.c
View File

@ -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);

6
fs/ceph/super.c
View File

@ -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");