Skip to content

Commit

Permalink
ceph: remove small mon addr limit; use CEPH_MAX_MON where appropriate
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Sage Weil committed Oct 22, 2009
1 parent 232d4b0 commit ecb19c4
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
4 changes: 2 additions & 2 deletions fs/ceph/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;

Expand Down
2 changes: 0 additions & 2 deletions fs/ceph/super.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit ecb19c4

Please sign in to comment.