xfs_repair: ignore "repaired" flag after we decide to clear xattr block

If in the course of examining extended attribute block contents we
first decide to repair an entry (*repair = 1) but secondly decide to
clear the whole block, set *repair = 0 because the clearing action
only happens if *repair == 0.  Put another way, if we're nuking a
block, don't pretend like we've fixed it too.

v2: fix all the paths to clear the attr block if the processing
functions error out.

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

diff --git a/repair/attr_repair.c b/repair/attr_repair.c
index 83a07a80c7f827a0c74d8ebfc4b11b3289f2ba4a..c2b7c3ad2ae3f9f0c5d4dfeaa2024c60c59ac0cb 100644 (file)
--- a/repair/attr_repair.c
+++ b/repair/attr_repair.c
@@ -1311,6 +1311,13 @@ process_leaf_attr_block(
                * we can add it then.
                */
        }
+       /*
+        * If we're just going to zap the block, don't pretend like we
+        * repaired it, because repairing the block stops the clear
+        * operation.
+        */
+       if (clearit)
+               *repair = 0;
        if (*repair)
                xfs_attr3_leaf_hdr_to_disk(mp->m_attr_geo, leaf, &leafhdr);
 
@@ -1524,6 +1531,7 @@ process_longform_attr(
        xfs_dahash_t    next_hashval;
        int             repairlinks = 0;
        struct xfs_attr3_icleaf_hdr leafhdr;
+       int             error;
 
        *repair = 0;
 
@@ -1589,6 +1597,7 @@ process_longform_attr(
        case XFS_ATTR3_LEAF_MAGIC:
                if (process_leaf_attr_block(mp, leaf, 0, ino, blkmap,
                                0, &next_hashval, repair)) {
+                       *repair = 0;
                        /* the block is bad.  lose the attribute fork. */
                        libxfs_putbuf(bp);
                        return(1);
@@ -1604,12 +1613,16 @@ process_longform_attr(
                        libxfs_writebuf(bp, 0);
                } else
                        libxfs_putbuf(bp);
-               return (process_node_attr(mp, ino, dip, blkmap)); /* + repair */
+               error = process_node_attr(mp, ino, dip, blkmap); /* + repair */
+               if (error)
+                       *repair = 0;
+               return error;
        default:
                do_warn(
        _("bad attribute leaf magic # %#x for dir ino %" PRIu64 "\n"),
                        be16_to_cpu(leaf->hdr.info.magic), ino);
                libxfs_putbuf(bp);
+               *repair = 0;
                return(1);
        }