From: Robert P. J. Day <rpjday@crashcourse.ca>
Date: Fri, 8 Feb 2008 02:10:06 +0000 (+0000)
Subject: dm snapshot: use rounddown_pow_of_two
X-Git-Tag: v2.6.25-rc1~280^2~36
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8defd83084c3ce46d314c038f7c0f0ed7156d6f8;p=linux-2.6-omap-h63xx.git

dm snapshot: use rounddown_pow_of_two

Since the source file already includes the log2.h header file, it
seems pointless to re-invent the necessary routine.

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
---

diff --git a/drivers/md/dm-snap.c b/drivers/md/dm-snap.c
index cee16fadd9e..fad84654b04 100644
--- a/drivers/md/dm-snap.c
+++ b/drivers/md/dm-snap.c
@@ -333,16 +333,6 @@ static int calc_max_buckets(void)
 	return mem;
 }
 
-/*
- * Rounds a number down to a power of 2.
- */
-static uint32_t round_down(uint32_t n)
-{
-	while (n & (n - 1))
-		n &= (n - 1);
-	return n;
-}
-
 /*
  * Allocate room for a suitable hash table.
  */
@@ -361,8 +351,7 @@ static int init_hash_tables(struct dm_snapshot *s)
 	hash_size = min(origin_dev_size, cow_dev_size) >> s->chunk_shift;
 	hash_size = min(hash_size, max_buckets);
 
-	/* Round it down to a power of 2 */
-	hash_size = round_down(hash_size);
+	hash_size = rounddown_pow_of_two(hash_size);
 	if (init_exception_table(&s->complete, hash_size))
 		return -ENOMEM;