---

yaml --- r: 251319 b: refs/heads/master c: 7662d8f h: refs/heads/master i: 251317: f0b1d33 251315: db0089a 251311: 352a714 v: v3
git-mirror · May 24, 2011 · dfdf6a5 · dfdf6a5
1 parent b32fef1
commit dfdf6a5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9db4b3e32778400555d5cc6fb61d4058902d37f7
+refs/heads/master: 7662d8ff57d2b00ce8f7fe0b60a85efbb2c05652
diff --git a/trunk/net/ceph/osdmap.c b/trunk/net/ceph/osdmap.c
@@ -830,15 +830,20 @@ struct ceph_osdmap *osdmap_apply_incremental(void **p, void *end,
 		map->osd_addr[osd] = addr;
 	}
 
-	/* new_down */
+	/* new_state */
 	ceph_decode_32_safe(p, end, len, bad);
 	while (len--) {
 		u32 osd;
+		u8 xorstate;
 		ceph_decode_32_safe(p, end, osd, bad);
+		xorstate = **(u8 **)p;
 		(*p)++;  /* clean flag */
-		pr_info("osd%d down\n", osd);
+		if (xorstate == 0)
+			xorstate = CEPH_OSD_UP;
+		if (xorstate & CEPH_OSD_UP)
+			pr_info("osd%d down\n", osd);
 		if (osd < map->max_osd)
-			map->osd_state[osd] &= ~CEPH_OSD_UP;
+			map->osd_state[osd] ^= xorstate;
 	}
 
 	/* new_weight */