[DRBD-cvs] svn commit by phil - r2155 - trunk/user - A small simplification.

[drbd-cvs at lists.linbit.com]

Author: phil
Date: 2006-04-19 10:26:09 +0200 (Wed, 19 Apr 2006)
New Revision: 2155

Modified:
   trunk/user/drbdmeta.c
Log:
A small simplification.


Modified: trunk/user/drbdmeta.c
===================================================================
--- trunk/user/drbdmeta.c	2006-04-19 08:25:47 UTC (rev 2154)
+++ trunk/user/drbdmeta.c	2006-04-19 08:26:09 UTC (rev 2155)
@@ -799,24 +799,12 @@
 	return ok;
 }
 
-int int_ln2(int v)
-{
-	int r=0;
-
-	while((v = v>>1)) r++;
-
-	return r;
-}
-
 unsigned long bm_words(u64 sectors, int bytes_per_bit)
 {
 	unsigned long long bits;
 	unsigned long long words;
-	int shift;
 
-	shift = int_ln2(bytes_per_bit) - 9;
-
-	bits = ALIGN(sectors, 8) >> shift;
+	bits = ALIGN(sectors, 8) / (bytes_per_bit / 512);
 	words = ALIGN(bits, 64) >> LN2_BPL;
 
 	return words;