xfs: fix a few erroneous process_error calls in the scrubbers

There are a few places where we make a libxfs api call on behalf of some
object other than the one we're scrubbing but inadvertently call the
regular process_error function.  When this happens we mark the object
corrupt even though it was corruption in /some other/ object that
actually produced the -EFSCORRUPTED code.  The correct output flag for
these situations is SCRUB_OFLAG_XFAIL, not SCRUB_OFLAG_CORRUPT, so fix
this now that we also have a helper to set these.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>

diff --git a/fs/xfs/scrub/dir.c b/fs/xfs/scrub/dir.c
index 69e1efdd4019141d17965915ff883e2fc517758f..e75826bb6516e1dedb3e0cc7c35a255c961e077e 100644 (file)
--- a/fs/xfs/scrub/dir.c
+++ b/fs/xfs/scrub/dir.c
@@ -92,7 +92,7 @@ xfs_scrub_dir_check_ftype(
         * inodes can trigger immediate inactive cleanup of the inode.
         */
        error = xfs_iget(mp, sdc->sc->tp, inum, 0, 0, &ip);
-       if (!xfs_scrub_fblock_process_error(sdc->sc, XFS_DATA_FORK, offset,
+       if (!xfs_scrub_fblock_xref_process_error(sdc->sc, XFS_DATA_FORK, offset,
                        &error))
                goto out;
 

diff --git a/fs/xfs/scrub/inode.c b/fs/xfs/scrub/inode.c
index 59a4fce91a2b954d7fb71a7c484402a5e6b6c6af..1c5b6466770532c2282a505aa783b4fd7141498a 100644 (file)
--- a/fs/xfs/scrub/inode.c
+++ b/fs/xfs/scrub/inode.c
@@ -619,7 +619,7 @@ xfs_scrub_inode(
        if (xfs_is_reflink_inode(sc->ip)) {
                error = xfs_reflink_inode_has_shared_extents(sc->tp, sc->ip,
                                &has_shared);
-               if (!xfs_scrub_process_error(sc, XFS_INO_TO_AGNO(mp, ino),
+               if (!xfs_scrub_xref_process_error(sc, XFS_INO_TO_AGNO(mp, ino),
                                XFS_INO_TO_AGBNO(mp, ino), &error))
                        goto out;
                if (!has_shared)

diff --git a/fs/xfs/scrub/parent.c b/fs/xfs/scrub/parent.c
index b4d2f8406d22d558d69cde7968f4ecc119e5ab5c..0d3851410c74feae8ffb5001a34568f47e177c4b 100644 (file)
--- a/fs/xfs/scrub/parent.c
+++ b/fs/xfs/scrub/parent.c
@@ -169,7 +169,7 @@ xfs_scrub_parent_validate(
         * immediate inactive cleanup of the inode.
         */
        error = xfs_iget(mp, sc->tp, dnum, 0, 0, &dp);
-       if (!xfs_scrub_fblock_process_error(sc, XFS_DATA_FORK, 0, &error))
+       if (!xfs_scrub_fblock_xref_process_error(sc, XFS_DATA_FORK, 0, &error))
                goto out;
        if (dp == sc->ip || !S_ISDIR(VFS_I(dp)->i_mode)) {
                xfs_scrub_fblock_set_corrupt(sc, XFS_DATA_FORK, 0);
@@ -185,7 +185,7 @@ xfs_scrub_parent_validate(
         */
        if (xfs_ilock_nowait(dp, XFS_IOLOCK_SHARED)) {
                error = xfs_scrub_parent_count_parent_dentries(sc, dp, &nlink);
-               if (!xfs_scrub_fblock_process_error(sc, XFS_DATA_FORK, 0,
+               if (!xfs_scrub_fblock_xref_process_error(sc, XFS_DATA_FORK, 0,
                                &error))
                        goto out_unlock;
                if (nlink != expected_nlink)
@@ -205,7 +205,7 @@ xfs_scrub_parent_validate(
 
        /* Go looking for our dentry. */
        error = xfs_scrub_parent_count_parent_dentries(sc, dp, &nlink);
-       if (!xfs_scrub_fblock_process_error(sc, XFS_DATA_FORK, 0, &error))
+       if (!xfs_scrub_fblock_xref_process_error(sc, XFS_DATA_FORK, 0, &error))
                goto out_unlock;
 
        /* Drop the parent lock, relock this inode. */