From: Sage Weil <sage@newdream.net>
Date: Thu, 17 Jun 2010 17:22:48 +0000 (-0700)
Subject: ceph: fix crush map update decoding
X-Git-Tag: v2.6.35-rc5~18^2~8
X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=cebc5be6b6c82a99231e9c9af451e9e3d3399ec6;p=net-next-2.6.git

ceph: fix crush map update decoding

If the incremental osdmap has a new crush map, advance the position after
decoding so that we can parse the rest of the osdmap properly.

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/fs/ceph/osdmap.c b/fs/ceph/osdmap.c
index ddc656fb5c0..50ce64ebd33 100644
--- a/fs/ceph/osdmap.c
+++ b/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? */