From: Kent Overstreet <kent.overstreet@linux.dev>
Date: Sat, 28 Sep 2024 06:44:12 +0000 (-0400)
Subject: bcachefs: Fix reattach_inode()
X-Git-Tag: v6.12-rc2~5^2~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=20826fe6b810bce3efba9ef5d74cf13ebe5f23d9;p=thirdparty%2Flinux.git

bcachefs: Fix reattach_inode()

Ensure a copy of the lost+found inode exists in the snapshot that we're
reattaching, so that we don't trigger warnings in
lookup_inode_for_snapshot() later.

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
---

diff --git a/fs/bcachefs/fsck.c b/fs/bcachefs/fsck.c
index 351de61c7ed12..881ad5b9447fd 100644
--- a/fs/bcachefs/fsck.c
+++ b/fs/bcachefs/fsck.c
@@ -354,13 +354,12 @@ static int reattach_inode(struct btree_trans *trans,
 	if (ret)
 		return ret;
 
-	if (S_ISDIR(inode->bi_mode)) {
-		lostfound.bi_nlink++;
+	lostfound.bi_nlink += S_ISDIR(inode->bi_mode);
 
-		ret = __bch2_fsck_write_inode(trans, &lostfound, U32_MAX);
-		if (ret)
-			return ret;
-	}
+	/* ensure lost+found inode is also present in inode snapshot */
+	ret = __bch2_fsck_write_inode(trans, &lostfound, inode_snapshot);
+	if (ret)
+		return ret;
 
 	dir_hash = bch2_hash_info_init(c, &lostfound);