diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2012-07-09 16:27:05 -0400 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2012-08-02 14:37:45 +0100 |
| commit | e44be732863c136e9560c6bf7bf9b9d709a59fca (patch) | |
| tree | d4e976c6238198d10a9e3b751bd02e86f7540e90 /fs/ext4/ext4.h | |
| parent | 6d0511498af83b9d09be2f52a69e3f9aca5db81e (diff) | |
| download | kernel_samsung_smdk4412-e44be732863c136e9560c6bf7bf9b9d709a59fca.zip kernel_samsung_smdk4412-e44be732863c136e9560c6bf7bf9b9d709a59fca.tar.gz kernel_samsung_smdk4412-e44be732863c136e9560c6bf7bf9b9d709a59fca.tar.bz2 | |
ext4: fix overhead calculation used by ext4_statfs()
commit 952fc18ef9ec707ebdc16c0786ec360295e5ff15 upstream.
Commit f975d6bcc7a introduced bug which caused ext4_statfs() to
miscalculate the number of file system overhead blocks. This causes
the f_blocks field in the statfs structure to be larger than it should
be. This would in turn cause the "df" output to show the number of
data blocks in the file system and the number of data blocks used to
be larger than they should be.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'fs/ext4/ext4.h')
| -rw-r--r-- | fs/ext4/ext4.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index 873897c..8cb184c 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -1123,8 +1123,7 @@ struct ext4_sb_info { unsigned long s_desc_per_block; /* Number of group descriptors per block */ ext4_group_t s_groups_count; /* Number of groups in the fs */ ext4_group_t s_blockfile_groups;/* Groups acceptable for non-extent files */ - unsigned long s_overhead_last; /* Last calculated overhead */ - unsigned long s_blocks_last; /* Last seen block count */ + unsigned long s_overhead; /* # of fs overhead clusters */ unsigned int s_cluster_ratio; /* Number of blocks per cluster */ unsigned int s_cluster_bits; /* log2 of s_cluster_ratio */ loff_t s_bitmap_maxbytes; /* max bytes for bitmap files */ @@ -1925,6 +1924,7 @@ extern int ext4_group_extend(struct super_block *sb, ext4_fsblk_t n_blocks_count); /* super.c */ +extern int ext4_calculate_overhead(struct super_block *sb); extern void *ext4_kvmalloc(size_t size, gfp_t flags); extern void *ext4_kvzalloc(size_t size, gfp_t flags); extern void ext4_kvfree(void *ptr); |