From 297eccd51415522bfbc7f4b2a94f2079d0b7cbc8 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Thu, 12 May 2011 15:18:43 -0700
Subject: [PATCH] --- yaml --- r: 251307 b: refs/heads/master c:
 31456665a02148353a83fec84d3182700e356588 h: refs/heads/master i:   251305:
 54ed9f2eeb2228d2fadf62a7132314f8c37166d8   251303:
 88b502147b1c1eb014c0bb0320a4a80baeb19549 v: v3

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

diff --git a/[refs] b/[refs]
index 196230cf9459..26c66986c179 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3540303f87115cbdae6ed2cab44ce6a7676d48d3
+refs/heads/master: 31456665a02148353a83fec84d3182700e356588
diff --git a/trunk/net/ceph/osdmap.c b/trunk/net/ceph/osdmap.c
index 71603ac3dff5..94f068dda433 100644
--- a/trunk/net/ceph/osdmap.c
+++ b/trunk/net/ceph/osdmap.c
@@ -765,7 +765,7 @@ struct ceph_osdmap *osdmap_apply_incremental(void **p, void *end,
 	}
 
 	map->epoch++;
-	map->modified = map->modified;
+	map->modified = modified;
 	if (newcrush) {
 		if (map->crush)
 			crush_destroy(map->crush);