From: Eric Sandeen <sandeen@redhat.com>
Date: Tue, 27 Mar 2018 02:27:28 +0000 (-0500)
Subject: xfs_repair: use custom ifork verifier in mv_orphanage
X-Git-Tag: v4.16.0-rc1~37
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f8cd7da8eec39dddbdeebac8617b64f2a1a2deb0;p=thirdparty%2Fxfsprogs-dev.git

xfs_repair: use custom ifork verifier in mv_orphanage

Now that we have a custom verifier which can ignore parent
inode numbers, use it in mv_orphanage() as well; orphan inodes
may have invalid parents, and we're about to reconnect
them anyway, so override that test when we get them off disk.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
---

diff --git a/repair/phase6.c b/repair/phase6.c
index ed005e8cc..498a3b554 100644
--- a/repair/phase6.c
+++ b/repair/phase6.c
@@ -1138,7 +1138,8 @@ mv_orphanage(
 		xname.len = snprintf((char *)fname, sizeof(fname), "%llu.%d",
 					(unsigned long long)ino, ++incr);
 
-	err = -libxfs_iget(mp, NULL, ino, 0, &ino_p, &xfs_default_ifork_ops);
+	/* Orphans may not have a proper parent, so use custom ops here */
+	err = -libxfs_iget(mp, NULL, ino, 0, &ino_p, &phase6_ifork_ops);
 	if (err)
 		do_error(_("%d - couldn't iget disconnected inode\n"), err);