diff options
| author |   Jiri Kosina <jkosina@suse.cz> | 2012-08-27 08:04:24 -0700 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-08-27 08:05:17 -0700 |
| commit | 66a61fc0b2c3475f26f65b5f29ed5945b8efbf9e (patch) | |
| tree | 28ebaaee56786cd9199e0e5802d166474d30d1e3 /fs/ext4/bitmap.c | |
| parent | HID: hid-debug: Show rdesc for unclaimed devices (diff) | |
| parent | Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid (diff) | |
| download | wireguard-linux-66a61fc0b2c3475f26f65b5f29ed5945b8efbf9e.tar.xz wireguard-linux-66a61fc0b2c3475f26f65b5f29ed5945b8efbf9e.zip | |
Merge branch 'master' into upstream
Sync with Linus' tree so that we don't have build falures
due to Quanta 3001 ID reshuffling.
Diffstat (limited to 'fs/ext4/bitmap.c')
| -rw-r--r-- | fs/ext4/bitmap.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/fs/ext4/bitmap.c b/fs/ext4/bitmap.c index b319721da26a..5c2d1813ebe9 100644 --- a/fs/ext4/bitmap.c +++ b/fs/ext4/bitmap.c @@ -11,24 +11,11 @@ #include <linux/jbd2.h> #include "ext4.h" -#ifdef EXT4FS_DEBUG - -static const int nibblemap[] = {4, 3, 3, 2, 3, 2, 2, 1, 3, 2, 2, 1, 2, 1, 1, 0}; - -unsigned int ext4_count_free(struct buffer_head *map, unsigned int numchars) +unsigned int ext4_count_free(char *bitmap, unsigned int numchars) { - unsigned int i, 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(bitmap, numchars); } -#endif /* EXT4FS_DEBUG */ - int ext4_inode_bitmap_csum_verify(struct super_block *sb, ext4_group_t group, struct ext4_group_desc *gdp, struct buffer_head *bh, int sz) @@ -92,7 +79,6 @@ int ext4_block_bitmap_csum_verify(struct super_block *sb, ext4_group_t group, if (provided == calculated) return 1; - ext4_error(sb, "Bad block bitmap checksum: block_group = %u", group); return 0; } |