Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc14657c authored by Yehuda Sadeh's avatar Yehuda Sadeh Committed by Sage Weil
Browse files

ceph: mount fails immediately on error 



Signed-off-by: default avatarYehuda Sadeh <yehuda@newdream.net>
parent 94045e11

fs/ceph/auth.c

+5 −0
Original line number Diff line number Diff line
@@ -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);

fs/ceph/super.c

+5 −1
Original line number Diff line number Diff line
@@ -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");