---

yaml --- r: 309477 b: refs/heads/master c: 6bd9adb h: refs/heads/master i: 309475: ac37422 v: v3
git-mirror · May 22, 2012 · 0d324bf · 0d324bf
1 parent 5268480
commit 0d324bf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35f9f8a09e1e88e31bd34a1e645ca0e5f070dd5c
+refs/heads/master: 6bd9adbdf9ca6a052b0b7455ac67b925eb38cfad
diff --git a/trunk/net/ceph/osdmap.c b/trunk/net/ceph/osdmap.c
@@ -883,8 +883,12 @@ struct ceph_osdmap *osdmap_apply_incremental(void **p, void *end,
 		pglen = ceph_decode_32(p);
 
 		if (pglen) {
-			/* insert */
 			ceph_decode_need(p, end, pglen*sizeof(u32), bad);
+
+			/* removing existing (if any) */
+			(void) __remove_pg_mapping(&map->pg_temp, pgid);
+
+			/* insert */
 			pg = kmalloc(sizeof(*pg) + sizeof(u32)*pglen, GFP_NOFS);
 			if (!pg) {
 				err = -ENOMEM;