aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext4/balloc.c
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2012-06-30 19:14:57 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-08-09 08:27:51 -0700
commit6ff2c41b81bd0778aa44ffcfce0ea623fa660887 (patch)
treed1ce1e944f62b249f2e673a79c8b704fc7ac5cc5 /fs/ext4/balloc.c
parenteb65b85e1bce06b665b3568c19a249cd886fa6ff (diff)
downloadkernel_samsung_smdk4412-6ff2c41b81bd0778aa44ffcfce0ea623fa660887.zip
kernel_samsung_smdk4412-6ff2c41b81bd0778aa44ffcfce0ea623fa660887.tar.gz
kernel_samsung_smdk4412-6ff2c41b81bd0778aa44ffcfce0ea623fa660887.tar.bz2
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/balloc.c')
-rw-r--r--fs/ext4/balloc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
index 264f694..ebe95f5 100644
--- a/fs/ext4/balloc.c
+++ b/fs/ext4/balloc.c
@@ -514,7 +514,8 @@ ext4_fsblk_t ext4_count_free_blocks(struct super_block *sb)
if (bitmap_bh == NULL)
continue;
- x = ext4_count_free(bitmap_bh, sb->s_blocksize);
+ x = ext4_count_free(bitmap_bh->b_data,
+ EXT4_BLOCKS_PER_GROUP(sb) / 8);
printk(KERN_DEBUG "group %u: stored = %d, counted = %u\n",
i, ext4_free_blks_count(sb, gdp), x);
bitmap_count += x;