diff options
-rw-r--r-- | fs/ext4/super.c | 2 | ||||
-rw-r--r-- | include/linux/ext4_fs.h | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 11e80f061cb2..b11e9e2bcd01 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c | |||
@@ -2709,7 +2709,7 @@ static int ext4_statfs (struct dentry * dentry, struct kstatfs * buf) | |||
2709 | buf->f_bsize = sb->s_blocksize; | 2709 | buf->f_bsize = sb->s_blocksize; |
2710 | buf->f_blocks = ext4_blocks_count(es) - sbi->s_overhead_last; | 2710 | buf->f_blocks = ext4_blocks_count(es) - sbi->s_overhead_last; |
2711 | buf->f_bfree = percpu_counter_sum_positive(&sbi->s_freeblocks_counter); | 2711 | buf->f_bfree = percpu_counter_sum_positive(&sbi->s_freeblocks_counter); |
2712 | es->s_free_blocks_count = cpu_to_le32(buf->f_bfree); | 2712 | ext4_free_blocks_count_set(es, buf->f_bfree); |
2713 | buf->f_bavail = buf->f_bfree - ext4_r_blocks_count(es); | 2713 | buf->f_bavail = buf->f_bfree - ext4_r_blocks_count(es); |
2714 | if (buf->f_bfree < ext4_r_blocks_count(es)) | 2714 | if (buf->f_bfree < ext4_r_blocks_count(es)) |
2715 | buf->f_bavail = 0; | 2715 | buf->f_bavail = 0; |
diff --git a/include/linux/ext4_fs.h b/include/linux/ext4_fs.h index d30d079a53e2..97dd409d5f4a 100644 --- a/include/linux/ext4_fs.h +++ b/include/linux/ext4_fs.h | |||
@@ -502,8 +502,8 @@ do { \ | |||
502 | struct ext4_super_block { | 502 | struct ext4_super_block { |
503 | /*00*/ __le32 s_inodes_count; /* Inodes count */ | 503 | /*00*/ __le32 s_inodes_count; /* Inodes count */ |
504 | __le32 s_blocks_count_lo; /* Blocks count */ | 504 | __le32 s_blocks_count_lo; /* Blocks count */ |
505 | __le32 s_r_blocks_count; /* Reserved blocks count */ | 505 | __le32 s_r_blocks_count_lo; /* Reserved blocks count */ |
506 | __le32 s_free_blocks_count; /* Free blocks count */ | 506 | __le32 s_free_blocks_count_lo; /* Free blocks count */ |
507 | /*10*/ __le32 s_free_inodes_count; /* Free inodes count */ | 507 | /*10*/ __le32 s_free_inodes_count; /* Free inodes count */ |
508 | __le32 s_first_data_block; /* First Data Block */ | 508 | __le32 s_first_data_block; /* First Data Block */ |
509 | __le32 s_log_block_size; /* Block size */ | 509 | __le32 s_log_block_size; /* Block size */ |
@@ -987,13 +987,13 @@ static inline ext4_fsblk_t ext4_blocks_count(struct ext4_super_block *es) | |||
987 | static inline ext4_fsblk_t ext4_r_blocks_count(struct ext4_super_block *es) | 987 | static inline ext4_fsblk_t ext4_r_blocks_count(struct ext4_super_block *es) |
988 | { | 988 | { |
989 | return ((ext4_fsblk_t)le32_to_cpu(es->s_r_blocks_count_hi) << 32) | | 989 | return ((ext4_fsblk_t)le32_to_cpu(es->s_r_blocks_count_hi) << 32) | |
990 | le32_to_cpu(es->s_r_blocks_count); | 990 | le32_to_cpu(es->s_r_blocks_count_lo); |
991 | } | 991 | } |
992 | 992 | ||
993 | static inline ext4_fsblk_t ext4_free_blocks_count(struct ext4_super_block *es) | 993 | static inline ext4_fsblk_t ext4_free_blocks_count(struct ext4_super_block *es) |
994 | { | 994 | { |
995 | return ((ext4_fsblk_t)le32_to_cpu(es->s_free_blocks_count_hi) << 32) | | 995 | return ((ext4_fsblk_t)le32_to_cpu(es->s_free_blocks_count_hi) << 32) | |
996 | le32_to_cpu(es->s_free_blocks_count); | 996 | le32_to_cpu(es->s_free_blocks_count_lo); |
997 | } | 997 | } |
998 | 998 | ||
999 | static inline void ext4_blocks_count_set(struct ext4_super_block *es, | 999 | static inline void ext4_blocks_count_set(struct ext4_super_block *es, |
@@ -1006,14 +1006,14 @@ static inline void ext4_blocks_count_set(struct ext4_super_block *es, | |||
1006 | static inline void ext4_free_blocks_count_set(struct ext4_super_block *es, | 1006 | static inline void ext4_free_blocks_count_set(struct ext4_super_block *es, |
1007 | ext4_fsblk_t blk) | 1007 | ext4_fsblk_t blk) |
1008 | { | 1008 | { |
1009 | es->s_free_blocks_count = cpu_to_le32((u32)blk); | 1009 | es->s_free_blocks_count_lo = cpu_to_le32((u32)blk); |
1010 | es->s_free_blocks_count_hi = cpu_to_le32(blk >> 32); | 1010 | es->s_free_blocks_count_hi = cpu_to_le32(blk >> 32); |
1011 | } | 1011 | } |
1012 | 1012 | ||
1013 | static inline void ext4_r_blocks_count_set(struct ext4_super_block *es, | 1013 | static inline void ext4_r_blocks_count_set(struct ext4_super_block *es, |
1014 | ext4_fsblk_t blk) | 1014 | ext4_fsblk_t blk) |
1015 | { | 1015 | { |
1016 | es->s_r_blocks_count = cpu_to_le32((u32)blk); | 1016 | es->s_r_blocks_count_lo = cpu_to_le32((u32)blk); |
1017 | es->s_r_blocks_count_hi = cpu_to_le32(blk >> 32); | 1017 | es->s_r_blocks_count_hi = cpu_to_le32(blk >> 32); |
1018 | } | 1018 | } |
1019 | 1019 | ||