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: 292c196a3695 ("f2fs: reserve nid resource for quota sysfile")
Fixes: 7b63f72f73af ("f2fs: fix to do sanity check on valid node/block count")
Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index a18b2a895771d9282a254dc2fff14ace550ce380..d9ba1db2d01eed8c50fb3200d712e9cb44af7f26 100644 (file)
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -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;

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 3435c8bccf3ed9828999d9751fce1e2271fd06d0..46d10a94721d67eb0d029c02dc88bb695d8543e0 100644 (file)
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -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);