From 81df534372ba641e48888d5a4b238bb2e62f396e Mon Sep 17 00:00:00 2001
From: Akinobu Mita <akinobu.mita@gmail.com>
Date: Mon, 30 Jul 2012 14:41:05 -0700
Subject: [PATCH] --- yaml --- r: 319930 b: refs/heads/master c:
 ecd0afa3ced0ebf36901b53fd9ee431f8a34a161 h: refs/heads/master v: v3

---
 [refs]                 |  2 +-
 trunk/fs/ext2/balloc.c | 14 ++------------
 trunk/fs/ext2/ialloc.c |  1 +
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 2a9fe3897c93..6cc13030da48 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a75613ec73ec87726a81fe421385a13c25fdcfc4
+refs/heads/master: ecd0afa3ced0ebf36901b53fd9ee431f8a34a161
diff --git a/trunk/fs/ext2/balloc.c b/trunk/fs/ext2/balloc.c
index 1c3613998862..376aa77f3ca7 100644
--- a/trunk/fs/ext2/balloc.c
+++ b/trunk/fs/ext2/balloc.c
@@ -1444,19 +1444,9 @@ ext2_fsblk_t ext2_new_block(struct inode *inode, unsigned long goal, int *errp)
 
 #ifdef EXT2FS_DEBUG
 
-static const int nibblemap[] = {4, 3, 3, 2, 3, 2, 2, 1, 3, 2, 2, 1, 2, 1, 1, 0};
-
-unsigned long ext2_count_free (struct buffer_head * map, unsigned int numchars)
+unsigned long ext2_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  /*  EXT2FS_DEBUG  */
diff --git a/trunk/fs/ext2/ialloc.c b/trunk/fs/ext2/ialloc.c
index c13eb7b91a11..8f370e012e61 100644
--- a/trunk/fs/ext2/ialloc.c
+++ b/trunk/fs/ext2/ialloc.c
@@ -644,6 +644,7 @@ unsigned long ext2_count_free_inodes (struct super_block * sb)
 	}
 	brelse(bitmap_bh);
 	printk("ext2_count_free_inodes: stored = %lu, computed = %lu, %lu\n",
+		(unsigned long)
 		percpu_counter_read(&EXT2_SB(sb)->s_freeinodes_counter),
 		desc_count, bitmap_count);
 	return desc_count;