From eeac9143545956a4856fbc636e8408283cd310be Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Thu, 8 Oct 2009 22:22:37 -0700
Subject: [PATCH] --- yaml --- r: 188571 b: refs/heads/master c:
 991abb6ecfc8edf9863aa6a3f43249e63f9d4d4e h: refs/heads/master i:   188569:
 59c47fb2b36b190ce7df6c17b344665dee5648e4   188567:
 ab5cf8f5d997f01cd7993cb79a8a8e188133820c v: v3

---
 [refs]                 |  2 +-
 trunk/fs/ceph/osdmap.c | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 13c754728280..a8a80fa5000b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0ba6478df7c6bef0f4b2625554545f941f89fb97
+refs/heads/master: 991abb6ecfc8edf9863aa6a3f43249e63f9d4d4e
diff --git a/trunk/fs/ceph/osdmap.c b/trunk/fs/ceph/osdmap.c
index e38fe6309b1c..342e5f80996b 100644
--- a/trunk/fs/ceph/osdmap.c
+++ b/trunk/fs/ceph/osdmap.c
@@ -366,8 +366,8 @@ static int osdmap_set_max_osd(struct ceph_osdmap *map, int max)
 /*
  * Insert a new pg_temp mapping
  */
-static void __insert_pg_mapping(struct ceph_pg_mapping *new,
-				struct rb_root *root)
+static int __insert_pg_mapping(struct ceph_pg_mapping *new,
+			       struct rb_root *root)
 {
 	struct rb_node **p = &root->rb_node;
 	struct rb_node *parent = NULL;
@@ -381,11 +381,12 @@ static void __insert_pg_mapping(struct ceph_pg_mapping *new,
 		else if (new->pgid > pg->pgid)
 			p = &(*p)->rb_right;
 		else
-			BUG();
+			return -EEXIST;
 	}
 
 	rb_link_node(&new->node, parent, p);
 	rb_insert_color(&new->node, root);
+	return 0;
 }
 
 /*
@@ -481,7 +482,9 @@ struct ceph_osdmap *osdmap_decode(void **p, void *end)
 		for (j = 0; j < n; j++)
 			ceph_decode_32(p, pg->osds[j]);
 
-		__insert_pg_mapping(pg, &map->pg_temp);
+		err = __insert_pg_mapping(pg, &map->pg_temp);
+		if (err)
+			goto bad;
 		dout(" added pg_temp %llx len %d\n", pgid, len);
 	}
 
@@ -681,7 +684,9 @@ struct ceph_osdmap *osdmap_apply_incremental(void **p, void *end,
 			pg->len = pglen;
 			for (j = 0; j < len; j++)
 				ceph_decode_32(p, pg->osds[j]);
-			__insert_pg_mapping(pg, &map->pg_temp);
+			err = __insert_pg_mapping(pg, &map->pg_temp);
+			if (err)
+				goto bad;
 			dout(" added pg_temp %llx len %d\n", pgid, pglen);
 		}
 	}