From: Piotr Dałek <git@predictor.org.pl>
Date: Wed, 31 Aug 2016 19:28:16 +0000 (+0200)
Subject: crush: remove clutter
X-Git-Tag: v11.0.1~270^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0d19408d91dd747340d70287b4ef9efd89e95c6b;p=ceph.git

crush: remove clutter

Remove extra x1 variable, it's just temporary placeholder that
clutters the code unnecessarily.

Signed-off-by: Piotr Dałek <git@predictor.org.pl>
---

diff --git a/src/crush/mapper.c b/src/crush/mapper.c
index 6f6b09e5807e..d565a67b149b 100644
--- a/src/crush/mapper.c
+++ b/src/crush/mapper.c
@@ -245,7 +245,7 @@ static int bucket_straw_choose(struct crush_bucket_straw *bucket,
 /* compute 2^44*log2(input+1) */
 static __u64 crush_ln(unsigned int xin)
 {
-	unsigned int x = xin, x1;
+	unsigned int x = xin;
 	int iexpon, index1, index2;
 	__u64 RH, LH, LL, xl64, result;
 
@@ -271,12 +271,11 @@ static __u64 crush_ln(unsigned int xin)
 	/* RH*x ~ 2^48 * (2^15 + xf), xf<2^8 */
 	xl64 = (__s64)x * RH;
 	xl64 >>= 48;
-	x1 = xl64;
 
 	result = iexpon;
 	result <<= (12 + 32);
 
-	index2 = x1 & 0xff;
+	index2 = xl64 & 0xff;
 	/* LL ~ 2^48*log2(1.0+index2/2^15) */
 	LL = __LL_tbl[index2];