From 00bb4d19dff57d911a54bf146cbf1dd11f56d51a Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Thu, 17 Jun 2010 10:22:48 -0700
Subject: [PATCH] --- yaml --- r: 200839 b: refs/heads/master c:
 cebc5be6b6c82a99231e9c9af451e9e3d3399ec6 h: refs/heads/master i:   200837:
 3267da09ee0165d8d925b8f826bd6c53a5ad6134   200835:
 9d8c524cabf98bea3f4534e464bd08396196f312   200831:
 843e71efca88689d31237920816910a93d94ea34 v: v3

---
 [refs]                 | 2 +-
 trunk/fs/ceph/osdmap.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4333413fd0fc..c9704243a47f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae32be31341a5fecfa16c5b3eb78095207182cce
+refs/heads/master: cebc5be6b6c82a99231e9c9af451e9e3d3399ec6
diff --git a/trunk/fs/ceph/osdmap.c b/trunk/fs/ceph/osdmap.c
index ddc656fb5c05..50ce64ebd330 100644
--- a/trunk/fs/ceph/osdmap.c
+++ b/trunk/fs/ceph/osdmap.c
@@ -707,6 +707,7 @@ struct ceph_osdmap *osdmap_apply_incremental(void **p, void *end,
 		newcrush = crush_decode(*p, min(*p+len, end));
 		if (IS_ERR(newcrush))
 			return ERR_CAST(newcrush);
+		*p += len;
 	}
 
 	/* new flags? */