Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27cae0bc authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: fix wrong available node count calculation 



In mkfs, we have counted quota file's node number in cp.valid_node_count,
so we have to avoid wrong substraction of quota node number in
.available_nid/.avail_node_count calculation.

f2fs_write_check_point_pack()
{
..
	set_cp(valid_node_count, 1 + c.quota_inum + c.lpf_inum);

Fixes: 292c196a ("f2fs: reserve nid resource for quota sysfile")
Fixes: 7b63f72f ("f2fs: fix to do sanity check on valid node/block count")
Signed-off-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 0b86f789

fs/f2fs/node.c

+1 −1
Original line number Diff line number Diff line
@@ -2964,7 +2964,7 @@ static int init_node_manager(struct f2fs_sb_info *sbi) 


	/* not used nids: 0, node, meta, (and root counted as valid node) */

	nm_i->available_nids = nm_i->max_nid - sbi->total_valid_node_count -

				sbi->nquota_files - F2FS_RESERVED_NODE_NUM;

						F2FS_RESERVED_NODE_NUM;

	nm_i->nid_cnt[FREE_NID] = 0;

	nm_i->nid_cnt[PREALLOC_NID] = 0;

	nm_i->nat_cnt = 0;

fs/f2fs/super.c

+2 −4
Original line number Diff line number Diff line
@@ -1269,8 +1269,7 @@ static int f2fs_statfs(struct dentry *dentry, struct kstatfs *buf) 
	else

		buf->f_bavail = 0;



	avail_node_count = sbi->total_node_count - sbi->nquota_files -

						F2FS_RESERVED_NODE_NUM;

	avail_node_count = sbi->total_node_count - F2FS_RESERVED_NODE_NUM;



	if (avail_node_count > user_block_count) {

		buf->f_files = user_block_count;
@@ -2700,8 +2699,7 @@ int f2fs_sanity_check_ckpt(struct f2fs_sb_info *sbi) 
	}



	valid_node_count = le32_to_cpu(ckpt->valid_node_count);

	avail_node_count = sbi->total_node_count - sbi->nquota_files -

						F2FS_RESERVED_NODE_NUM;

	avail_node_count = sbi->total_node_count - F2FS_RESERVED_NODE_NUM;

	if (valid_node_count > avail_node_count) {

		f2fs_err(sbi, "Wrong valid_node_count: %u, avail_node_count: %u",

			 valid_node_count, avail_node_count);