From 0d324bf8b5e5e481a794934ee260f8e25fcf135f Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@inktank.com>
Date: Mon, 21 May 2012 09:45:23 -0700
Subject: [PATCH] --- yaml --- r: 309477 b: refs/heads/master c:
 6bd9adbdf9ca6a052b0b7455ac67b925eb38cfad h: refs/heads/master i:   309475:
 ac3742232089a3975876248be5fbc4d226f7d41a v: v3

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

diff --git a/[refs] b/[refs]
index cc804a00517a..84253352008b 100644
--- 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
index 2592f3cca987..1892c523c43c 100644
--- 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;