From 38381e07d9b1979f2bed498a1dc92381bc9086c9 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Mon, 26 Oct 2009 22:07:53 -0700
Subject: [PATCH] --- yaml --- r: 188591 b: refs/heads/master c:
 7b813c46021e8f4909772a5bbfb5212bd140764c h: refs/heads/master i:   188589:
 03171b2610599e80deaee65a21affb49b4a8a36e   188587:
 6d5af2665963827903b8531d00071e6e4686c154   188583:
 a5e7ac77aba1fdbe5b28b5071626ad4260506ada   188575:
 e952cf459f9e60ce44c48032abc80343ef130f59 v: v3

---
 [refs]                |  2 +-
 trunk/fs/ceph/super.c | 25 +++++++++++++++++--------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index e3a1cf1a185a..5876ae5ceb21 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ecb19c4649d7396737eb0d91a475661fe9d7c028
+refs/heads/master: 7b813c46021e8f4909772a5bbfb5212bd140764c
diff --git a/trunk/fs/ceph/super.c b/trunk/fs/ceph/super.c
index 81916250f0b6..deb51bd6ed83 100644
--- a/trunk/fs/ceph/super.c
+++ b/trunk/fs/ceph/super.c
@@ -314,12 +314,16 @@ static int parse_mount_args(struct ceph_client *client,
 	int err;
 	substring_t argstr[MAX_OPT_ARGS];
 	int num_mon;
-	struct ceph_entity_addr mon_addr[CEPH_MAX_MON];
+	struct ceph_entity_addr *mon_addr;
 	int i;
 
 	dout("parse_mount_args dev_name '%s'\n", dev_name);
 	memset(args, 0, sizeof(*args));
 
+	mon_addr = kcalloc(CEPH_MAX_MON, sizeof(*mon_addr), GFP_KERNEL);
+	if (!mon_addr)
+		return -ENOMEM;
+
 	/* start with defaults */
 	args->sb_flags = flags;
 	args->flags = CEPH_OPT_DEFAULT;
@@ -333,27 +337,29 @@ static int parse_mount_args(struct ceph_client *client,
 	args->max_readdir = 1024;
 
 	/* ip1[:port1][,ip2[:port2]...]:/subdir/in/fs */
+	err = -EINVAL;
 	if (!dev_name)
-		return -EINVAL;
+		goto out;
 	*path = strstr(dev_name, ":/");
 	if (*path == NULL) {
 		pr_err("device name is missing path (no :/ in %s)\n",
 		       dev_name);
-		return -EINVAL;
+		goto out;
 	}
 
 	/* get mon ip(s) */
 	err = ceph_parse_ips(dev_name, *path, mon_addr,
 			     CEPH_MAX_MON, &num_mon);
 	if (err < 0)
-		return err;
+		goto out;
 
 	/* build initial monmap */
+	err = -ENOMEM;
 	client->monc.monmap = kzalloc(sizeof(*client->monc.monmap) +
 			       num_mon*sizeof(client->monc.monmap->mon_inst[0]),
 			       GFP_KERNEL);
 	if (!client->monc.monmap)
-		return -ENOMEM;
+		goto out;
 	for (i = 0; i < num_mon; i++) {
 		client->monc.monmap->mon_inst[i].addr = mon_addr[i];
 		client->monc.monmap->mon_inst[i].addr.erank = 0;
@@ -374,11 +380,11 @@ static int parse_mount_args(struct ceph_client *client,
 		int token, intval, ret;
 		if (!*c)
 			continue;
+		err = -EINVAL;
 		token = match_token((char *)c, arg_tokens, argstr);
 		if (token < 0) {
 			pr_err("bad mount option at '%s'\n", c);
-			return -EINVAL;
-
+			goto out;
 		}
 		if (token < Opt_ip) {
 			ret = match_int(&argstr[0], &intval);
@@ -468,8 +474,11 @@ static int parse_mount_args(struct ceph_client *client,
 			BUG_ON(token);
 		}
 	}
+	err = 0;
 
-	return 0;
+out:
+	kfree(mon_addr);
+	return err;
 }
 
 static void release_mount_args(struct ceph_mount_args *args)