From: Signed-off-by: NeilBrown <neilb@suse.com>
Date: Fri, 12 Jul 2019 17:27:28 +0000 (-0400)
Subject: LU-12542 ldlm: simplify lock_mode_to_index()
X-Git-Tag: 2.12.57~119
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=32ae82e57cf8dfcd4361e9522ea57e473676a743;p=fs%2Flustre-release.git

LU-12542 ldlm: simplify lock_mode_to_index()

This function has the same effect as ilog2(), so just use ilog2
directly.

Change-Id: If90207c328b549e85cb6d38a6604dfb8c7b6c8a0
Signed-off-by: NeilBrown <neilb@suse.com>
Reviewed-on: https://review.whamcloud.com/35486
Tested-by: jenkins <devops@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/lustre/ldlm/ldlm_extent.c b/lustre/ldlm/ldlm_extent.c
index 82e13ef..330e5b7 100644
--- a/lustre/ldlm/ldlm_extent.c
+++ b/lustre/ldlm/ldlm_extent.c
@@ -1020,8 +1020,7 @@ static inline int ldlm_mode_to_index(enum ldlm_mode mode)
 
 	LASSERT(mode != 0);
 	LASSERT(is_power_of_2(mode));
-	for (index = -1; mode != 0; index++, mode >>= 1)
-		/* do nothing */;
+	index = ilog2(mode);
 	LASSERT(index < LCK_MODE_NUM);
 	return index;
 }