diff options
author | Jaegeuk Kim <jaegeuk@kernel.org> | 2017-06-21 23:55:55 -0400 |
---|---|---|
committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2017-07-07 13:34:40 -0400 |
commit | 0cc091d0c8c34092c471fb5ae7335d075d08c324 (patch) | |
tree | cf9186d45d44cab1f4bcef57e8eb9c4c9b6f662d /fs/f2fs/super.c | |
parent | 34dc77ad74368707f0f51f42536e38e6ef30ff22 (diff) |
f2fs: report # of free inodes more precisely
If the partition is small, we don't need to report total # of inodes including
hidden free nodes.
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs/f2fs/super.c')
-rw-r--r-- | fs/f2fs/super.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 8e39b850bfc0..3da6fb276f8b 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c | |||
@@ -680,6 +680,7 @@ static int f2fs_statfs(struct dentry *dentry, struct kstatfs *buf) | |||
680 | struct f2fs_sb_info *sbi = F2FS_SB(sb); | 680 | struct f2fs_sb_info *sbi = F2FS_SB(sb); |
681 | u64 id = huge_encode_dev(sb->s_bdev->bd_dev); | 681 | u64 id = huge_encode_dev(sb->s_bdev->bd_dev); |
682 | block_t total_count, user_block_count, start_count, ovp_count; | 682 | block_t total_count, user_block_count, start_count, ovp_count; |
683 | u64 avail_node_count; | ||
683 | 684 | ||
684 | total_count = le64_to_cpu(sbi->raw_super->block_count); | 685 | total_count = le64_to_cpu(sbi->raw_super->block_count); |
685 | user_block_count = sbi->user_block_count; | 686 | user_block_count = sbi->user_block_count; |
@@ -692,9 +693,16 @@ static int f2fs_statfs(struct dentry *dentry, struct kstatfs *buf) | |||
692 | buf->f_bfree = user_block_count - valid_user_blocks(sbi) + ovp_count; | 693 | buf->f_bfree = user_block_count - valid_user_blocks(sbi) + ovp_count; |
693 | buf->f_bavail = user_block_count - valid_user_blocks(sbi); | 694 | buf->f_bavail = user_block_count - valid_user_blocks(sbi); |
694 | 695 | ||
695 | buf->f_files = sbi->total_node_count - F2FS_RESERVED_NODE_NUM; | 696 | avail_node_count = sbi->total_node_count - F2FS_RESERVED_NODE_NUM; |
696 | buf->f_ffree = min(buf->f_files - valid_node_count(sbi), | 697 | |
697 | buf->f_bavail); | 698 | if (avail_node_count > user_block_count) { |
699 | buf->f_files = user_block_count; | ||
700 | buf->f_ffree = buf->f_bavail; | ||
701 | } else { | ||
702 | buf->f_files = avail_node_count; | ||
703 | buf->f_ffree = min(avail_node_count - valid_node_count(sbi), | ||
704 | buf->f_bavail); | ||
705 | } | ||
698 | 706 | ||
699 | buf->f_namelen = F2FS_NAME_LEN; | 707 | buf->f_namelen = F2FS_NAME_LEN; |
700 | buf->f_fsid.val[0] = (u32)id; | 708 | buf->f_fsid.val[0] = (u32)id; |