| commit | cebc5be6b6c82a99231e9c9af451e9e3d3399ec6 | [log] [tgz] |
|---|---|---|
| author | Sage Weil <sage@newdream.net> | Thu Jun 17 10:22:48 2010 -0700 |
| committer | Sage Weil <sage@newdream.net> | Thu Jun 17 10:22:48 2010 -0700 |
| tree | 5899be89ac6396cb38ca938f922ef0a8ab57d3b3 | |
| parent | ae32be31341a5fecfa16c5b3eb78095207182cce [diff] [blame] |
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 ddc656f..50ce64e 100644 --- a/fs/ceph/osdmap.c +++ b/fs/ceph/osdmap.c
@@ -707,6 +707,7 @@ newcrush = crush_decode(*p, min(*p+len, end)); if (IS_ERR(newcrush)) return ERR_CAST(newcrush); + *p += len; } /* new flags? */