f2fs-tools: introduce set_node_footer to initialize node footer
PATCH v4 1/1 f2fs-tools: introduce set_node_footer to initialize node footer
From: Wuyun Zhao <[email protected]>
the filesystem will use the cold flag, so deal with it to avoid potential issue of inconsistency
Signed-off-by Wuyun Zhao <[email protected]>
Reviewed-by Chao Yu <[email protected]>
--- fsck/dir.c | 7 ++----- fsck/node.c | 12 +++++------- include/f2fs_fs.h | 23 +++++++++++++++++++++++ mkfs/f2fs_format.c | 34 +++++++++++++--------------------- 4 files changed, 43 insertions(+), 33 deletions(-)
fsck/dir.c +2 -5
@@ -517,11 +517,8 @@ static void init_inode_block(struct f2fs_sb_info *sbi, }set_file_temperature (sbi, node_blk, de->name); - - node_blk->footer.ino =cpu_to_le32 (de->ino); - node_blk->footer.nid =cpu_to_le32 (de->ino); - node_blk->footer.flag =0 ; - node_blk->footer.cp_ver = ckpt->checkpoint_ver; +set_node_footer (node_blk, de->ino, de->ino,0 , +le64_to_cpu (ckpt->checkpoint_ver),0 ,S_ISDIR (mode));if (S_ISDIR (mode)) {make_empty_dir (sbi, node_blk);
fsck/node.c +5 -7
@@ -61,7 +61,7 @@ void set_data_blkaddr(struct dnode_of_data *dn)block_t new_node_block (struct f2fs_sb_info *sbi,struct dnode_of_data *dn,unsigned int ofs) { -struct f2fs_node *f2fs_inode; +struct f2fs_node *f2fs_inode = dn->inode_blk;struct f2fs_node *node_blk;struct f2fs_checkpoint *ckpt =F2FS_CKPT (sbi);struct f2fs_summary sum;
@@ -69,16 +69,14 @@ block_t new_node_block(struct f2fs_sb_info *sbi,block_t blkaddr =NULL_ADDR ;int type;int ret; - - f2fs_inode = dn->inode_blk; +nid_t ino =le32_to_cpu (f2fs_inode->footer.ino); +u64 cp_ver =le64_to_cpu (ckpt->checkpoint_ver); node_blk =calloc (BLOCK_SZ ,1 );ASSERT (node_blk); - node_blk->footer.nid =cpu_to_le32 (dn->nid); - node_blk->footer.ino = f2fs_inode->footer.ino; - node_blk->footer.flag =cpu_to_le32 (ofs <<OFFSET_BIT_SHIFT ); - node_blk->footer.cp_ver = ckpt->checkpoint_ver; +set_node_footer (node_blk, dn->nid, ino, ofs, cp_ver,0 , +S_ISDIR (le16_to_cpu (f2fs_inode->i.i_mode))); type =CURSEG_COLD_NODE ;if (IS_DNODE (node_blk)) {
include/f2fs_fs.h +23 -0
@@ -923,6 +923,29 @@ struct f2fs_node {struct node_footer footer; } __attribute__((packed)); +static inline void set_cold_node (struct f2fs_node *rn,bool is_dir) +{ +unsigned int flag =le32_to_cpu (rn->footer.flag); + +if (is_dir) + flag &= ~(0x1 <<COLD_BIT_SHIFT ); +else + flag |= (0x1 <<COLD_BIT_SHIFT ); + rn->footer.flag =cpu_to_le32 (flag); +} + +static inline void set_node_footer (struct f2fs_node *rn,nid_t nid,nid_t ino, +u32 ofs,u64 ver,block_t blkaddr, +bool is_dir) +{ + rn->footer.nid =cpu_to_le32 (nid); + rn->footer.ino =cpu_to_le32 (ino); + rn->footer.flag =cpu_to_le32 (ofs <<OFFSET_BIT_SHIFT ); + rn->footer.cp_ver =cpu_to_le64 (ver); + rn->footer.next_blkaddr =cpu_to_le32 (blkaddr); +set_cold_node (rn, is_dir); +} +/* * For NAT entries */
mkfs/f2fs_format.c +13 -21
@@ -1094,6 +1094,9 @@ static int f2fs_write_root_inode(void)struct f2fs_node *raw_node =NULL ;u_int64_t blk_size_bytes, data_blk_nor;u_int64_t main_area_node_seg_blk_offset =0 ; +nid_t nid =le32_to_cpu (sb->root_ino); +block_t blkaddr =get_sb (main_blkaddr) + + c.cur_seg[CURSEG_HOT_NODE ] * c.blks_per_seg +1 ; raw_node =calloc (F2FS_BLKSIZE ,1 );if (raw_node ==NULL ) {
@@ -1101,13 +1104,7 @@ static int f2fs_write_root_inode(void)return -1 ; } - raw_node->footer.nid = sb->root_ino; - raw_node->footer.ino = sb->root_ino; - raw_node->footer.cp_ver =cpu_to_le64 (1 ); - raw_node->footer.next_blkaddr =cpu_to_le32 ( -get_sb (main_blkaddr) + - c.cur_seg[CURSEG_HOT_NODE ] * - c.blks_per_seg +1 ); +set_node_footer (raw_node, nid, nid,0 ,1 , blkaddr,1 ); raw_node->i.i_mode =cpu_to_le16 (0x41ed );if (c.lpf_ino)
@@ -1256,6 +1253,10 @@ static int f2fs_write_qf_inode(int qtype)u_int64_t main_area_node_seg_blk_offset =0 ;__le32 raw_id;int i; +nid_t qf_ino =le32_to_cpu (sb->qf_ino[qtype]); +block_t blkaddr =get_sb (main_blkaddr) + + c.cur_seg[CURSEG_HOT_NODE ] * + c.blks_per_seg +1 + qtype +1 ; raw_node =calloc (F2FS_BLKSIZE ,1 );if (raw_node ==NULL ) {
@@ -1263,13 +1264,7 @@ static int f2fs_write_qf_inode(int qtype)return -1 ; } - raw_node->footer.nid = sb->qf_ino[qtype]; - raw_node->footer.ino = sb->qf_ino[qtype]; - raw_node->footer.cp_ver =cpu_to_le64 (1 ); - raw_node->footer.next_blkaddr =cpu_to_le32 ( -get_sb (main_blkaddr) + - c.cur_seg[CURSEG_HOT_NODE ] * - c.blks_per_seg +1 + qtype +1 ); +set_node_footer (raw_node, qf_ino, qf_ino,0 ,1 , blkaddr,0 ); raw_node->i.i_mode =cpu_to_le16 (0x8180 ); raw_node->i.i_links =cpu_to_le32 (1 );
@@ -1447,6 +1442,9 @@ static int f2fs_write_lpf_inode(void)struct f2fs_node *raw_node;u_int64_t blk_size_bytes, main_area_node_seg_blk_offset;block_t data_blk_nor; +block_t blkaddr =get_sb (main_blkaddr) + + c.cur_seg[CURSEG_HOT_NODE ] * c.blks_per_seg + +1 + c.quota_inum +1 ;int err =0 ;ASSERT (c.lpf_ino);
@@ -1457,13 +1455,7 @@ static int f2fs_write_lpf_inode(void)return -1 ; } - raw_node->footer.nid =cpu_to_le32 (c.lpf_ino); - raw_node->footer.ino = raw_node->footer.nid; - raw_node->footer.cp_ver =cpu_to_le64 (1 ); - raw_node->footer.next_blkaddr =cpu_to_le32 ( -get_sb (main_blkaddr) + - c.cur_seg[CURSEG_HOT_NODE ] * c.blks_per_seg + -1 + c.quota_inum +1 ); +set_node_footer (raw_node, c.lpf_ino, c.lpf_ino,0 ,1 , blkaddr,1 ); raw_node->i.i_mode =cpu_to_le16 (0x41c0 );/* 0700 */ raw_node->i.i_links =cpu_to_le32 (2 );
Signature · 8 lines
2.7.4 _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel