| Message ID | 9cf10ff8-878a-b4dc-1e32-c657c0d2354a@sandeen.net (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Thu, Mar 22, 2018 at 02:35:34PM -0500, Eric Sandeen wrote: > 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> Looks ok, Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> --D > --- > > diff --git a/repair/phase6.c b/repair/phase6.c > index ed005e8..498a3b5 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); > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/repair/phase6.c b/repair/phase6.c index ed005e8..498a3b5 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);
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> --- -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html