summaryrefslogtreecommitdiff
path: root/fs/ext4/bitmap.c
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2012-07-01 03:14:57 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-08-09 19:31:40 +0400
commit2a271d6a66d1d10f001c5653da68c1f72d0ded59 (patch)
tree75b43233ebdf83d5f5706c95365a56f4b64280cc /fs/ext4/bitmap.c
parent66b68d2374b0c251224c28c69fc25eeef343e122 (diff)
downloadlinux-2a271d6a66d1d10f001c5653da68c1f72d0ded59.tar.xz
ext4: pass a char * to ext4_count_free() instead of a buffer_head ptr
commit f6fb99cadcd44660c68e13f6eab28333653621e6 upstream. Make it possible for ext4_count_free to operate on buffers and not just data in buffer_heads. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/ext4/bitmap.c')
-rw-r--r--fs/ext4/bitmap.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/fs/ext4/bitmap.c b/fs/ext4/bitmap.c
index fa3af81ac565..012faaaec4ad 100644
--- a/fs/ext4/bitmap.c
+++ b/fs/ext4/bitmap.c
@@ -15,15 +15,13 @@
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];
+ sum += nibblemap[bitmap[i] & 0xf] +
+ nibblemap[(bitmap[i] >> 4) & 0xf];
return sum;
}