提交 ecb19c46 编写于 作者: S Sage Weil

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: NSage Weil <sage@newdream.net>
上级 232d4b01
...@@ -314,7 +314,7 @@ static int parse_mount_args(struct ceph_client *client, ...@@ -314,7 +314,7 @@ static int parse_mount_args(struct ceph_client *client,
int err; int err;
substring_t argstr[MAX_OPT_ARGS]; substring_t argstr[MAX_OPT_ARGS];
int num_mon; 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; int i;
dout("parse_mount_args dev_name '%s'\n", dev_name); dout("parse_mount_args dev_name '%s'\n", dev_name);
...@@ -344,7 +344,7 @@ static int parse_mount_args(struct ceph_client *client, ...@@ -344,7 +344,7 @@ static int parse_mount_args(struct ceph_client *client,
/* get mon ip(s) */ /* get mon ip(s) */
err = ceph_parse_ips(dev_name, *path, mon_addr, err = ceph_parse_ips(dev_name, *path, mon_addr,
CEPH_MAX_MON_MOUNT_ADDR, &num_mon); CEPH_MAX_MON, &num_mon);
if (err < 0) if (err < 0)
return err; return err;
......
...@@ -47,8 +47,6 @@ ...@@ -47,8 +47,6 @@
(!!((client)->mount_args.flags & CEPH_OPT_##opt)) (!!((client)->mount_args.flags & CEPH_OPT_##opt))
#define CEPH_MAX_MON_MOUNT_ADDR 5
struct ceph_mount_args { struct ceph_mount_args {
int sb_flags; int sb_flags;
int flags; int flags;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册