[PATCH 03/10] xfs_repair: ignore "repaired" flag after we decide to clear xattr block

Darrick J. Wong
2015-08-15T01:44:10Z

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.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
repair/attr_repair.c | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/repair/attr_repair.c b/repair/attr_repair.c
index 62f80e7..2bd9334 100644
--- 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;

@@ -1604,12 +1612,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);
}