[Xenial SRU 3/6] Revert "crush: decode and initialize chooseleaf_stable"

[Thadeu Lima de Souza Cascardo]

BugLink: https://bugs.launchpad.net/bugs/1737033

This reverts commit c043f509409e380281403f66c54794efbd5d0f02.

Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo at canonical.com>
---
 net/ceph/osdmap.c | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/net/ceph/osdmap.c b/net/ceph/osdmap.c
index 94a9acbee51e..bc95e48d5cfb 100644
--- a/net/ceph/osdmap.c
+++ b/net/ceph/osdmap.c
@@ -342,32 +342,23 @@ static struct crush_map *crush_decode(void *pbyval, void *end)
         c->choose_local_tries = ceph_decode_32(p);
         c->choose_local_fallback_tries =  ceph_decode_32(p);
         c->choose_total_tries = ceph_decode_32(p);
-        dout("crush decode tunable choose_local_tries = %d\n",
+        dout("crush decode tunable choose_local_tries = %d",
              c->choose_local_tries);
-        dout("crush decode tunable choose_local_fallback_tries = %d\n",
+        dout("crush decode tunable choose_local_fallback_tries = %d",
              c->choose_local_fallback_tries);
-        dout("crush decode tunable choose_total_tries = %d\n",
+        dout("crush decode tunable choose_total_tries = %d",
              c->choose_total_tries);
 
 	ceph_decode_need(p, end, sizeof(u32), done);
 	c->chooseleaf_descend_once = ceph_decode_32(p);
-	dout("crush decode tunable chooseleaf_descend_once = %d\n",
+	dout("crush decode tunable chooseleaf_descend_once = %d",
 	     c->chooseleaf_descend_once);
 
 	ceph_decode_need(p, end, sizeof(u8), done);
 	c->chooseleaf_vary_r = ceph_decode_8(p);
-	dout("crush decode tunable chooseleaf_vary_r = %d\n",
+	dout("crush decode tunable chooseleaf_vary_r = %d",
 	     c->chooseleaf_vary_r);
 
-	/* skip straw_calc_version, allowed_bucket_algs */
-	ceph_decode_need(p, end, sizeof(u8) + sizeof(u32), done);
-	*p += sizeof(u8) + sizeof(u32);
-
-	ceph_decode_need(p, end, sizeof(u8), done);
-	c->chooseleaf_stable = ceph_decode_8(p);
-	dout("crush decode tunable chooseleaf_stable = %d\n",
-	     c->chooseleaf_stable);
-
 done:
 	dout("crush_decode success\n");
 	return c;
-- 
2.14.1