From 4f9383c00ba3203265729a4b3e7bbb2596b57913 Mon Sep 17 00:00:00 2001
From: Coywolf Qi Hunt <qiyong@fc-cn.com>
Date: Fri, 24 Mar 2006 03:18:05 -0800
Subject: [PATCH] --- yaml --- r: 23435 b: refs/heads/master c:
 38885bd4c2a4b59ddb22271d3e6c621859c76f02 h: refs/heads/master i:   23433:
 02c9a4639038df966e9d3c5c59e57240ad447f12   23431:
 06868dfaf568841e0e51b32cbbdc9008c242c659 v: v3

---
 [refs]               | 2 +-
 trunk/fs/block_dev.c | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 7c8d38c15b4d..720aec24538e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a94ddf3ab866df9c187c9d8b3870b7ec38c6f7ad
+refs/heads/master: 38885bd4c2a4b59ddb22271d3e6c621859c76f02
diff --git a/trunk/fs/block_dev.c b/trunk/fs/block_dev.c
index 2d096057ab53..573fc8e0b67a 100644
--- a/trunk/fs/block_dev.c
+++ b/trunk/fs/block_dev.c
@@ -86,16 +86,12 @@ EXPORT_SYMBOL(set_blocksize);
 
 int sb_set_blocksize(struct super_block *sb, int size)
 {
-	int bits = 9; /* 2^9 = 512 */
-
 	if (set_blocksize(sb->s_bdev, size))
 		return 0;
 	/* If we get here, we know size is power of two
 	 * and it's value is between 512 and PAGE_SIZE */
 	sb->s_blocksize = size;
-	for (size >>= 10; size; size >>= 1)
-		++bits;
-	sb->s_blocksize_bits = bits;
+	sb->s_blocksize_bits = blksize_bits(size);
 	return sb->s_blocksize;
 }