diff options
| author | Yehuda Sadeh | 2009-11-20 22:59:13 +0100 |
|---|---|---|
| committer | Sage Weil | 2009-11-20 23:24:46 +0100 |
| commit | dc14657c9c946f25b84a98e9ffa41b812a70699e (patch) | |
| tree | 3ac124fd88bf85244114a3e7646b87b84ef6ae9d /fs/ceph/super.c | |
| parent | ceph: decode updated mdsmap format (diff) | |
| download | kernel-qcow2-linux-dc14657c9c946f25b84a98e9ffa41b812a70699e.tar.gz kernel-qcow2-linux-dc14657c9c946f25b84a98e9ffa41b812a70699e.tar.xz kernel-qcow2-linux-dc14657c9c946f25b84a98e9ffa41b812a70699e.zip | |
ceph: mount fails immediately on error
Signed-off-by: Yehuda Sadeh <yehuda@newdream.net>
Diffstat (limited to 'fs/ceph/super.c')
| -rw-r--r-- | fs/ceph/super.c | 6 |
1 files changed, 5 insertions, 1 deletions
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"); |