From: Bill O'Donnell Date: Fri, 21 Mar 2025 22:05:35 +0000 (-0500) Subject: xfs_repair: handling a block with bad crc, bad uuid, and bad magic number needs fixing X-Git-Tag: v6.14.0~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8cd85addd72f1f6e569bd286f6a44dfce90355f1;p=thirdparty%2Fxfsprogs-dev.git xfs_repair: handling a block with bad crc, bad uuid, and bad magic number needs fixing In certain cases, if a block is so messed up that crc, uuid and magic number are all bad, we need to not only detect in phase3 but fix it properly in phase6. In the current code, the mechanism doesn't work in that it only pays attention to one of the parameters. Note: in this case, the nlink inode link count drops to 1, but re-running xfs_repair fixes it back to 2. This is a side effect that should probably be handled in update_inode_nlinks() with separate patch. Regardless, running xfs_repair twice, with this patch applied fixes the issue. Recognize that this patch is a fix for xfs v5. Signed-off-by: Bill O'Donnell Reviewed-by: "Darrick J. Wong" v2: remove superfluous needmagic logic v3: clarify the description Reviewed-by: Christoph Hellwig Reviewed-by: Darrick J. Wong --- diff --git a/repair/phase6.c b/repair/phase6.c index 44b9bfc3..dbc090a5 100644 --- a/repair/phase6.c +++ b/repair/phase6.c @@ -2378,7 +2378,6 @@ longform_dir2_entry_check( da_bno = (xfs_dablk_t)next_da_bno) { const struct xfs_buf_ops *ops; int error; - struct xfs_dir2_data_hdr *d; next_da_bno = da_bno + mp->m_dir_geo->fsbcount - 1; if (bmap_next_offset(ip, &next_da_bno)) { @@ -2426,9 +2425,7 @@ longform_dir2_entry_check( } /* check v5 metadata */ - d = bp->b_addr; - if (be32_to_cpu(d->magic) == XFS_DIR3_BLOCK_MAGIC || - be32_to_cpu(d->magic) == XFS_DIR3_DATA_MAGIC) { + if (xfs_has_crc(mp)) { error = check_dir3_header(mp, bp, ino); if (error) { fixit++;