---

yaml --- r: 188590 b: refs/heads/master c: ecb19c4 h: refs/heads/master v: v3
git-mirror · Oct 22, 2009 · 9a2183d · 9a2183d
1 parent 03171b2
commit 9a2183d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 232d4b01319767b3ffa5d08962a81c805962be49
+refs/heads/master: ecb19c4649d7396737eb0d91a475661fe9d7c028
diff --git a/trunk/fs/ceph/super.c b/trunk/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/trunk/fs/ceph/super.h b/trunk/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;