From f148c756d0dcc4d86a89782f3fb085d077d01aed Mon Sep 17 00:00:00 2001
From: Akinobu Mita <akinobu.mita@gmail.com>
Date: Mon, 30 Jul 2012 14:41:06 -0700
Subject: [PATCH] --- yaml --- r: 319931 b: refs/heads/master c:
 10d470849a7c6dd360e8ad4770160ad7af9adb4b h: refs/heads/master i:   319929:
 7d70b06843b4d992f09221b3709d677657f7c8eb   319927:
 f5d11dbe4924a364e3e52897b45982390bdc084b v: v3

---
 [refs]                 |  2 +-
 trunk/fs/ext3/balloc.c |  2 +-
 trunk/fs/ext3/bitmap.c | 12 +-----------
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 6cc13030da48..539884fb436b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ecd0afa3ced0ebf36901b53fd9ee431f8a34a161
+refs/heads/master: 10d470849a7c6dd360e8ad4770160ad7af9adb4b
diff --git a/trunk/fs/ext3/balloc.c b/trunk/fs/ext3/balloc.c
index 25cd60892116..90d901f0486b 100644
--- a/trunk/fs/ext3/balloc.c
+++ b/trunk/fs/ext3/balloc.c
@@ -1813,7 +1813,7 @@ ext3_fsblk_t ext3_count_free_blocks(struct super_block *sb)
 	brelse(bitmap_bh);
 	printk("ext3_count_free_blocks: stored = "E3FSBLK
 		", computed = "E3FSBLK", "E3FSBLK"\n",
-	       le32_to_cpu(es->s_free_blocks_count),
+	       (ext3_fsblk_t)le32_to_cpu(es->s_free_blocks_count),
 		desc_count, bitmap_count);
 	return bitmap_count;
 #else
diff --git a/trunk/fs/ext3/bitmap.c b/trunk/fs/ext3/bitmap.c
index 909d13e26560..ef9c643e8e9d 100644
--- a/trunk/fs/ext3/bitmap.c
+++ b/trunk/fs/ext3/bitmap.c
@@ -11,19 +11,9 @@
 
 #ifdef EXT3FS_DEBUG
 
-static const int nibblemap[] = {4, 3, 3, 2, 3, 2, 2, 1, 3, 2, 2, 1, 2, 1, 1, 0};
-
 unsigned long ext3_count_free (struct buffer_head * map, unsigned int numchars)
 {
-	unsigned int i;
-	unsigned long sum = 0;
-
-	if (!map)
-		return (0);
-	for (i = 0; i < numchars; i++)
-		sum += nibblemap[map->b_data[i] & 0xf] +
-			nibblemap[(map->b_data[i] >> 4) & 0xf];
-	return (sum);
+	return numchars * BITS_PER_BYTE - memweight(map->b_data, numchars);
 }
 
 #endif  /*  EXT3FS_DEBUG  */