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

Commit ecb19c46 authored by Sage Weil's avatar Sage Weil
Browse files

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: default avatarSage Weil <sage@newdream.net>
parent 232d4b01

fs/ceph/super.c

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

fs/ceph/super.h

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