OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ae32be3
)
ceph: fix crush map update decoding
author
Sage Weil
<sage@newdream.net>
Thu, 17 Jun 2010 17:22:48 +0000
(10:22 -0700)
committer
Sage Weil
<sage@newdream.net>
Thu, 17 Jun 2010 17:22:48 +0000
(10:22 -0700)
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>
fs/ceph/osdmap.c
patch
|
blob
|
history
diff --git
a/fs/ceph/osdmap.c
b/fs/ceph/osdmap.c
index
ddc656f
..
50ce64e
100644
(file)
--- 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? */