f2fs-tools: convert lost+found dir to regular dentry before adding nodes

Message ID 20231129194033.999207-1-daeho43@gmail.com
State New
Headers
Series f2fs-tools: convert lost+found dir to regular dentry before adding nodes |

Commit Message

Daeho Jeong Nov. 29, 2023, 7:40 p.m. UTC
  From: Daeho Jeong <daehojeong@google.com>

fsck doesn't support adding inodes to inline dentries. So, need to
convert inline lost+found dentry before adding missing inodes.

Signed-off-by: Daeho Jeong <daehojeong@google.com>
---
 fsck/fsck.c | 8 ++++++++
 fsck/fsck.h | 4 ++++
 2 files changed, 12 insertions(+)
  

Patch

diff --git a/fsck/fsck.c b/fsck/fsck.c
index 55eddca..f40b4cd 100644
--- a/fsck/fsck.c
+++ b/fsck/fsck.c
@@ -2849,6 +2849,14 @@  static struct f2fs_node *fsck_get_lpf(struct f2fs_sb_info *sbi)
 			/* FIXME: give up? */
 			goto out;
 		}
+
+		/* Must convert inline dentry before adding inodes */
+		err = convert_inline_dentry(sbi, node, ni.blk_addr);
+		if (err) {
+			MSG(0, "Convert inline dentry for ino=%x failed.\n",
+					lpf_ino);
+			goto out;
+		}
 	} else { /* not found, create it */
 		struct dentry de;
 
diff --git a/fsck/fsck.h b/fsck/fsck.h
index f6f15e7..d6abf18 100644
--- a/fsck/fsck.h
+++ b/fsck/fsck.h
@@ -330,4 +330,8 @@  void *read_all_xattrs(struct f2fs_sb_info *, struct f2fs_node *, bool);
 void write_all_xattrs(struct f2fs_sb_info *sbi,
 		struct f2fs_node *inode, __u32 hsize, void *txattr_addr);
 
+/* dir.c */
+int convert_inline_dentry(struct f2fs_sb_info *sbi, struct f2fs_node *node,
+		block_t p_blkaddr);
+
 #endif /* _FSCK_H_ */