From: Sage Weil <sage@newdream.net>
Date: Thu, 22 Oct 2009 17:53:02 +0000 (-0700)
Subject: ceph: remove small mon addr limit; use CEPH_MAX_MON where appropriate
X-Git-Tag: Ubuntu-5.10.0-12.13~29046^2~156
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=ecb19c4649d7396737eb0d91a475661fe9d7c028;p=mirror_ubuntu-hirsute-kernel.git

ceph: remove small mon addr limit; use CEPH_MAX_MON where appropriate

Get rid of separate max mon limit; use the system limit instead.  This
allows mounts when there are lots of mon addrs provided by mount.ceph (as
with a host with lots of A/AAAA records).

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/fs/ceph/super.c b/fs/ceph/super.c
index ab950fce4172..81916250f0b6 100644
--- a/fs/ceph/super.c
+++ b/fs/ceph/super.c
@@ -314,7 +314,7 @@ 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_MOUNT_ADDR];
+	struct ceph_entity_addr mon_addr[CEPH_MAX_MON];
 	int i;
 
 	dout("parse_mount_args dev_name '%s'\n", dev_name);
@@ -344,7 +344,7 @@ static int parse_mount_args(struct ceph_client *client,
 
 	/* get mon ip(s) */
 	err = ceph_parse_ips(dev_name, *path, mon_addr,
-			     CEPH_MAX_MON_MOUNT_ADDR, &num_mon);
+			     CEPH_MAX_MON, &num_mon);
 	if (err < 0)
 		return err;
 
diff --git a/fs/ceph/super.h b/fs/ceph/super.h
index 75556e97e865..3af42d9097ec 100644
--- a/fs/ceph/super.h
+++ b/fs/ceph/super.h
@@ -47,8 +47,6 @@
 	(!!((client)->mount_args.flags & CEPH_OPT_##opt))
 
 
-#define CEPH_MAX_MON_MOUNT_ADDR	5
-
 struct ceph_mount_args {
 	int sb_flags;
 	int flags;