summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2009-10-22 21:53:02 +0400
committerSage Weil <sage@newdream.net>2009-10-22 21:53:17 +0400
commitecb19c4649d7396737eb0d91a475661fe9d7c028 (patch)
tree32ff9e8b3a9afffe5c9b7e97f1aef6b367c08dde /fs
parent232d4b01319767b3ffa5d08962a81c805962be49 (diff)
downloadlinux-ecb19c4649d7396737eb0d91a475661fe9d7c028.tar.xz
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>
Diffstat (limited to 'fs')
-rw-r--r--fs/ceph/super.c4
-rw-r--r--fs/ceph/super.h2
2 files changed, 2 insertions, 4 deletions
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;