aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext4/balloc.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ext4/balloc.c')
-rw-r--r--fs/ext4/balloc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
index bf42b3219e3c..84dc3d62b40c 100644
--- a/fs/ext4/balloc.c
+++ b/fs/ext4/balloc.c
@@ -168,7 +168,7 @@ void ext4_init_block_bitmap(struct super_block *sb, struct buffer_head *bh,
168 * essentially implementing a per-group read-only flag. */ 168 * essentially implementing a per-group read-only flag. */
169 if (!ext4_group_desc_csum_verify(sbi, block_group, gdp)) { 169 if (!ext4_group_desc_csum_verify(sbi, block_group, gdp)) {
170 ext4_error(sb, "Checksum bad for group %u", block_group); 170 ext4_error(sb, "Checksum bad for group %u", block_group);
171 ext4_free_blks_set(sb, gdp, 0); 171 ext4_free_group_clusters_set(sb, gdp, 0);
172 ext4_free_inodes_set(sb, gdp, 0); 172 ext4_free_inodes_set(sb, gdp, 0);
173 ext4_itable_unused_set(sb, gdp, 0); 173 ext4_itable_unused_set(sb, gdp, 0);
174 memset(bh->b_data, 0xff, sb->s_blocksize); 174 memset(bh->b_data, 0xff, sb->s_blocksize);
@@ -550,7 +550,7 @@ ext4_fsblk_t ext4_count_free_blocks(struct super_block *sb)
550 gdp = ext4_get_group_desc(sb, i, NULL); 550 gdp = ext4_get_group_desc(sb, i, NULL);
551 if (!gdp) 551 if (!gdp)
552 continue; 552 continue;
553 desc_count += ext4_free_blks_count(sb, gdp); 553 desc_count += ext4_free_group_clusters(sb, gdp);
554 brelse(bitmap_bh); 554 brelse(bitmap_bh);
555 bitmap_bh = ext4_read_block_bitmap(sb, i); 555 bitmap_bh = ext4_read_block_bitmap(sb, i);
556 if (bitmap_bh == NULL) 556 if (bitmap_bh == NULL)
@@ -558,7 +558,7 @@ ext4_fsblk_t ext4_count_free_blocks(struct super_block *sb)
558 558
559 x = ext4_count_free(bitmap_bh, sb->s_blocksize); 559 x = ext4_count_free(bitmap_bh, sb->s_blocksize);
560 printk(KERN_DEBUG "group %u: stored = %d, counted = %u\n", 560 printk(KERN_DEBUG "group %u: stored = %d, counted = %u\n",
561 i, ext4_free_blks_count(sb, gdp), x); 561 i, ext4_free_group_clusters(sb, gdp), x);
562 bitmap_count += x; 562 bitmap_count += x;
563 } 563 }
564 brelse(bitmap_bh); 564 brelse(bitmap_bh);
@@ -572,7 +572,7 @@ ext4_fsblk_t ext4_count_free_blocks(struct super_block *sb)
572 gdp = ext4_get_group_desc(sb, i, NULL); 572 gdp = ext4_get_group_desc(sb, i, NULL);
573 if (!gdp) 573 if (!gdp)
574 continue; 574 continue;
575 desc_count += ext4_free_blks_count(sb, gdp); 575 desc_count += ext4_free_group_clusters(sb, gdp);
576 } 576 }
577 577
578 return desc_count; 578 return desc_count;