aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext4/super.c
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2011-09-09 19:10:51 -0400
committerTheodore Ts'o <tytso@mit.edu>2011-09-09 19:10:51 -0400
commit5dee54372c1ea15ab482b959634cda8c01b042bd (patch)
tree512da0144f6a9f86b5817569d0521b60cddee4c9 /fs/ext4/super.c
parent021b65bb1e4e4b625c80bbb82651e5e155721ef3 (diff)
ext4: rename ext4_count_free_blocks() to ext4_count_free_clusters()
This function really counts the free clusters reported in the block group descriptors, so rename it to reduce confusion. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/ext4/super.c')
-rw-r--r--fs/ext4/super.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 30cf0e1bd89c..07f3de341452 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -2153,7 +2153,8 @@ static int ext4_check_descriptors(struct super_block *sb,
2153 if (NULL != first_not_zeroed) 2153 if (NULL != first_not_zeroed)
2154 *first_not_zeroed = grp; 2154 *first_not_zeroed = grp;
2155 2155
2156 ext4_free_blocks_count_set(sbi->s_es, ext4_count_free_blocks(sb)); 2156 ext4_free_blocks_count_set(sbi->s_es,
2157 EXT4_C2B(sbi, ext4_count_free_clusters(sb)));
2157 sbi->s_es->s_free_inodes_count =cpu_to_le32(ext4_count_free_inodes(sb)); 2158 sbi->s_es->s_free_inodes_count =cpu_to_le32(ext4_count_free_inodes(sb));
2158 return 1; 2159 return 1;
2159} 2160}
@@ -3577,7 +3578,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
3577 sbi->s_err_report.data = (unsigned long) sb; 3578 sbi->s_err_report.data = (unsigned long) sb;
3578 3579
3579 err = percpu_counter_init(&sbi->s_freeclusters_counter, 3580 err = percpu_counter_init(&sbi->s_freeclusters_counter,
3580 ext4_count_free_blocks(sb)); 3581 ext4_count_free_clusters(sb));
3581 if (!err) { 3582 if (!err) {
3582 err = percpu_counter_init(&sbi->s_freeinodes_counter, 3583 err = percpu_counter_init(&sbi->s_freeinodes_counter,
3583 ext4_count_free_inodes(sb)); 3584 ext4_count_free_inodes(sb));
@@ -3703,7 +3704,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
3703 * need to update the global counters. 3704 * need to update the global counters.
3704 */ 3705 */
3705 percpu_counter_set(&sbi->s_freeclusters_counter, 3706 percpu_counter_set(&sbi->s_freeclusters_counter,
3706 ext4_count_free_blocks(sb)); 3707 ext4_count_free_clusters(sb));
3707 percpu_counter_set(&sbi->s_freeinodes_counter, 3708 percpu_counter_set(&sbi->s_freeinodes_counter,
3708 ext4_count_free_inodes(sb)); 3709 ext4_count_free_inodes(sb));
3709 percpu_counter_set(&sbi->s_dirs_counter, 3710 percpu_counter_set(&sbi->s_dirs_counter,