Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

crush: decode and initialize chooseleaf_stable

Also add missing \n while at it.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Sage Weil <sage@redhat.com>

+14 -5
+14 -5
net/ceph/osdmap.c
··· 342 342 c->choose_local_tries = ceph_decode_32(p); 343 343 c->choose_local_fallback_tries = ceph_decode_32(p); 344 344 c->choose_total_tries = ceph_decode_32(p); 345 - dout("crush decode tunable choose_local_tries = %d", 345 + dout("crush decode tunable choose_local_tries = %d\n", 346 346 c->choose_local_tries); 347 - dout("crush decode tunable choose_local_fallback_tries = %d", 347 + dout("crush decode tunable choose_local_fallback_tries = %d\n", 348 348 c->choose_local_fallback_tries); 349 - dout("crush decode tunable choose_total_tries = %d", 349 + dout("crush decode tunable choose_total_tries = %d\n", 350 350 c->choose_total_tries); 351 351 352 352 ceph_decode_need(p, end, sizeof(u32), done); 353 353 c->chooseleaf_descend_once = ceph_decode_32(p); 354 - dout("crush decode tunable chooseleaf_descend_once = %d", 354 + dout("crush decode tunable chooseleaf_descend_once = %d\n", 355 355 c->chooseleaf_descend_once); 356 356 357 357 ceph_decode_need(p, end, sizeof(u8), done); 358 358 c->chooseleaf_vary_r = ceph_decode_8(p); 359 - dout("crush decode tunable chooseleaf_vary_r = %d", 359 + dout("crush decode tunable chooseleaf_vary_r = %d\n", 360 360 c->chooseleaf_vary_r); 361 + 362 + /* skip straw_calc_version, allowed_bucket_algs */ 363 + ceph_decode_need(p, end, sizeof(u8) + sizeof(u32), done); 364 + *p += sizeof(u8) + sizeof(u32); 365 + 366 + ceph_decode_need(p, end, sizeof(u8), done); 367 + c->chooseleaf_stable = ceph_decode_8(p); 368 + dout("crush decode tunable chooseleaf_stable = %d\n", 369 + c->chooseleaf_stable); 361 370 362 371 done: 363 372 dout("crush_decode success\n");