Skip to content

Commit 000519f

Browse files
chaseyuJaegeuk Kim
chaseyu
authored and
Jaegeuk Kim
committed
f2fs: don't count inode block in in-memory inode.i_blocks
Previously, we count all inode consumed blocks including inode block, xattr block, index block, data block into i_blocks, for other generic filesystems, they won't count inode block into i_blocks, so for userspace applications or quota system, they may detect incorrect block count according to i_blocks value in inode. This patch changes to count all blocks into inode.i_blocks excluding inode block, for on-disk i_blocks, we keep counting inode block for backward compatibility. Signed-off-by: Chao Yu <yuchao0@huawei.com> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
1 parent 6ac851b commit 000519f

File tree

3 files changed

+20
-22
lines changed

3 files changed

+20
-22
lines changed

‎fs/f2fs/f2fs.h

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1355,17 +1355,14 @@ static inline int check_nid_range(struct f2fs_sb_info *sbi, nid_t nid)
13551355
return 0;
13561356
}
13571357

1358-
#define F2FS_DEFAULT_ALLOCATED_BLOCKS 1
1359-
13601358
/*
13611359
* Check whether the inode has blocks or not
13621360
*/
13631361
static inline int F2FS_HAS_BLOCKS(struct inode *inode)
13641362
{
13651363
block_t xattr_block = F2FS_I(inode)->i_xattr_nid ? 1 : 0;
13661364

1367-
return (inode->i_blocks >> F2FS_LOG_SECTORS_PER_BLOCK) >
1368-
(F2FS_DEFAULT_ALLOCATED_BLOCKS + xattr_block);
1365+
return (inode->i_blocks >> F2FS_LOG_SECTORS_PER_BLOCK) > xattr_block;
13691366
}
13701367

13711368
static inline bool f2fs_has_xattr_block(unsigned int ofs)
@@ -1552,7 +1549,7 @@ static inline block_t __start_sum_addr(struct f2fs_sb_info *sbi)
15521549
}
15531550

15541551
static inline bool inc_valid_node_count(struct f2fs_sb_info *sbi,
1555-
struct inode *inode)
1552+
struct inode *inode, bool is_inode)
15561553
{
15571554
block_t valid_block_count;
15581555
unsigned int valid_node_count;
@@ -1572,8 +1569,12 @@ static inline bool inc_valid_node_count(struct f2fs_sb_info *sbi,
15721569
return false;
15731570
}
15741571

1575-
if (inode)
1576-
f2fs_i_blocks_write(inode, 1, true);
1572+
if (inode) {
1573+
if (is_inode)
1574+
f2fs_mark_inode_dirty_sync(inode, true);
1575+
else
1576+
f2fs_i_blocks_write(inode, 1, true);
1577+
}
15771578

15781579
sbi->total_valid_node_count++;
15791580
sbi->total_valid_block_count++;
@@ -1584,15 +1585,16 @@ static inline bool inc_valid_node_count(struct f2fs_sb_info *sbi,
15841585
}
15851586

15861587
static inline void dec_valid_node_count(struct f2fs_sb_info *sbi,
1587-
struct inode *inode)
1588+
struct inode *inode, bool is_inode)
15881589
{
15891590
spin_lock(&sbi->stat_lock);
15901591

15911592
f2fs_bug_on(sbi, !sbi->total_valid_block_count);
15921593
f2fs_bug_on(sbi, !sbi->total_valid_node_count);
1593-
f2fs_bug_on(sbi, !inode->i_blocks);
1594+
f2fs_bug_on(sbi, !is_inode && !inode->i_blocks);
15941595

1595-
f2fs_i_blocks_write(inode, 1, false);
1596+
if (!is_inode)
1597+
f2fs_i_blocks_write(inode, 1, false);
15961598
sbi->total_valid_node_count--;
15971599
sbi->total_valid_block_count--;
15981600

‎fs/f2fs/inode.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ static int do_read_inode(struct inode *inode)
130130
i_gid_write(inode, le32_to_cpu(ri->i_gid));
131131
set_nlink(inode, le32_to_cpu(ri->i_links));
132132
inode->i_size = le64_to_cpu(ri->i_size);
133-
inode->i_blocks = SECTOR_FROM_BLOCK(le64_to_cpu(ri->i_blocks));
133+
inode->i_blocks = SECTOR_FROM_BLOCK(le64_to_cpu(ri->i_blocks) - 1);
134134

135135
inode->i_atime.tv_sec = le64_to_cpu(ri->i_atime);
136136
inode->i_ctime.tv_sec = le64_to_cpu(ri->i_ctime);
@@ -268,7 +268,7 @@ int update_inode(struct inode *inode, struct page *node_page)
268268
ri->i_gid = cpu_to_le32(i_gid_read(inode));
269269
ri->i_links = cpu_to_le32(inode->i_nlink);
270270
ri->i_size = cpu_to_le64(i_size_read(inode));
271-
ri->i_blocks = cpu_to_le64(SECTOR_TO_BLOCK(inode->i_blocks));
271+
ri->i_blocks = cpu_to_le64(SECTOR_TO_BLOCK(inode->i_blocks) + 1);
272272

273273
if (et) {
274274
read_lock(&et->lock);

‎fs/f2fs/node.c

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -678,23 +678,19 @@ static void truncate_node(struct dnode_of_data *dn)
678678
struct node_info ni;
679679

680680
get_node_info(sbi, dn->nid, &ni);
681-
if (dn->inode->i_blocks == 0) {
682-
f2fs_bug_on(sbi, ni.blk_addr != NULL_ADDR);
683-
goto invalidate;
684-
}
685681
f2fs_bug_on(sbi, ni.blk_addr == NULL_ADDR);
686682

687683
/* Deallocate node address */
688684
invalidate_blocks(sbi, ni.blk_addr);
689-
dec_valid_node_count(sbi, dn->inode);
685+
dec_valid_node_count(sbi, dn->inode, dn->nid == dn->inode->i_ino);
690686
set_node_addr(sbi, &ni, NULL_ADDR, false);
691687

692688
if (dn->nid == dn->inode->i_ino) {
693689
remove_orphan_inode(sbi, dn->nid);
694690
dec_valid_inode_count(sbi);
695691
f2fs_inode_synced(dn->inode);
696692
}
697-
invalidate:
693+
698694
clear_node_page_dirty(dn->node_page);
699695
set_sbi_flag(sbi, SBI_IS_DIRTY);
700696

@@ -1044,7 +1040,7 @@ struct page *new_node_page(struct dnode_of_data *dn,
10441040
if (!page)
10451041
return ERR_PTR(-ENOMEM);
10461042

1047-
if (unlikely(!inc_valid_node_count(sbi, dn->inode))) {
1043+
if (unlikely(!inc_valid_node_count(sbi, dn->inode, !ofs))) {
10481044
err = -ENOSPC;
10491045
goto fail;
10501046
}
@@ -2207,14 +2203,14 @@ int recover_xattr_data(struct inode *inode, struct page *page, block_t blkaddr)
22072203
get_node_info(sbi, prev_xnid, &ni);
22082204
f2fs_bug_on(sbi, ni.blk_addr == NULL_ADDR);
22092205
invalidate_blocks(sbi, ni.blk_addr);
2210-
dec_valid_node_count(sbi, inode);
2206+
dec_valid_node_count(sbi, inode, false);
22112207
set_node_addr(sbi, &ni, NULL_ADDR, false);
22122208

22132209
recover_xnid:
22142210
/* 2: update xattr nid in inode */
22152211
remove_free_nid(sbi, new_xnid);
22162212
f2fs_i_xnid_write(inode, new_xnid);
2217-
if (unlikely(!inc_valid_node_count(sbi, inode)))
2213+
if (unlikely(!inc_valid_node_count(sbi, inode, false)))
22182214
f2fs_bug_on(sbi, 1);
22192215
update_inode_page(inode);
22202216

@@ -2272,7 +2268,7 @@ int recover_inode_page(struct f2fs_sb_info *sbi, struct page *page)
22722268
new_ni = old_ni;
22732269
new_ni.ino = ino;
22742270

2275-
if (unlikely(!inc_valid_node_count(sbi, NULL)))
2271+
if (unlikely(!inc_valid_node_count(sbi, NULL, true)))
22762272
WARN_ON(1);
22772273
set_node_addr(sbi, &new_ni, NEW_ADDR, false);
22782274
inc_valid_inode_count(sbi);

0 commit comments

Comments
 (0)