Skip to contentSkip to conversation

hpfs: Use bitmap_weight()

PATCH New Akinobu Mita 1 participant 1 message Nov 16, 2009 Hpfs filesystem

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 hpfs: Use bitmap_weight()

Use bitmap_weight instead of doing hweight32 for each 32bit in bitmap.

This patch applies on top of hpfs-use-hweight32.patch in -mm

Cc Mikulas Patocka <[email protected]>
Cc Al Viro <[email protected]>
---
 fs/hpfs/super.c |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)
fs/hpfs/super.c +8 -6
index cf6fe4a..cadc4ce 100644
@@ -14,6 +14,7 @@
 #include <linux/magic.h>
 #include <linux/sched.h>
 #include <linux/smp_lock.h>
+#include <linux/bitmap.h>
 
 /* Mark the filesystem dirty, so that chkdsk checks it when os/2 booted */
 
@@ -115,12 +116,13 @@ static void hpfs_put_super(struct super_block *s)
 unsigned hpfs_count_one_bitmap(struct super_block *s, secno secno)
 {
 	struct quad_buffer_head qbh;
-	unsigned *bits;
-	unsigned i, count;
-	if (!(bits = hpfs_map_4sectors(s, secno, &qbh, 4))) return 0;
-	count = 0;
-	for (i = 0; i < 2048 / sizeof(unsigned); i++)
-		count += hweight32(bits[i]);
+	unsigned long *bits;
+	unsigned count;
+
+	bits = hpfs_map_4sectors(s, secno, &qbh, 4);
+	if (!bits)
+		return 0;
+	count = bitmap_weight(bits, 2048 * BITS_PER_BYTE);
 	hpfs_brelse4(&qbh);
 	return count;
 }
Signature · 1 line
1.6.5.1