aboutsummaryrefslogtreecommitdiffstats
path: root/net/ceph/osdmap.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ceph/osdmap.c')
-rw-r--r--net/ceph/osdmap.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/net/ceph/osdmap.c b/net/ceph/osdmap.c
index de73214b5d26..ca05871635bc 100644
--- a/net/ceph/osdmap.c
+++ b/net/ceph/osdmap.c
@@ -170,6 +170,7 @@ static struct crush_map *crush_decode(void *pbyval, void *end)
170 c->choose_local_tries = 2; 170 c->choose_local_tries = 2;
171 c->choose_local_fallback_tries = 5; 171 c->choose_local_fallback_tries = 5;
172 c->choose_total_tries = 19; 172 c->choose_total_tries = 19;
173 c->chooseleaf_descend_once = 0;
173 174
174 ceph_decode_need(p, end, 4*sizeof(u32), bad); 175 ceph_decode_need(p, end, 4*sizeof(u32), bad);
175 magic = ceph_decode_32(p); 176 magic = ceph_decode_32(p);
@@ -336,6 +337,11 @@ static struct crush_map *crush_decode(void *pbyval, void *end)
336 dout("crush decode tunable choose_total_tries = %d", 337 dout("crush decode tunable choose_total_tries = %d",
337 c->choose_total_tries); 338 c->choose_total_tries);
338 339
340 ceph_decode_need(p, end, sizeof(u32), done);
341 c->chooseleaf_descend_once = ceph_decode_32(p);
342 dout("crush decode tunable chooseleaf_descend_once = %d",
343 c->chooseleaf_descend_once);
344
339done: 345done:
340 dout("crush_decode success\n"); 346 dout("crush_decode success\n");
341 return c; 347 return c;