xfs: check da node block pad field during scrub
PATCH v2 1/1 xfs: check da node block pad field during scrub
The da node block header (xfs_da3_node_hdr) contains a __pad32 field that should always be zero. Add a check for this during directory and attribute btree scrubbing.
Since old kernels may have written non-zero padding without issues, flag this as an optimization opportunity (preen) rather than corruption.
---
Changes in v2:
- Use xchk_da_set_preen instead of xchk_da_set_corrupt since
old kernels may have written non-zero padding without issues.
- Link to v1: https://lore.kernel.org/all/[email protected]/
--- fs/xfs/scrub/dabtree.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
fs/xfs/scrub/dabtree.c +6 -1
@@ -454,7 +454,12 @@ xchk_da_btree_block( } } -/* XXX: Check hdr3.pad32 once we know how to fix it. */ +if (xfs_has_crc (ip->i_mount)) { +struct xfs_da3_node_hdr *nodehdr3 = blk->bp->b_addr; + +if (be32_to_cpu (nodehdr3->__pad32) !=0 ) +xchk_da_set_preen (ds, level); + }break ;default :xchk_da_set_corrupt (ds, level);
Signature · 8 lines
2.50.1 Amazon Web Services EMEA SARL, 38 avenue John F. Kennedy, L-1855 Luxembourg, R.C.S. Luxembourg B186284 Amazon Web Services EMEA SARL, Irish Branch, One Burlington Plaza, Burlington Road, Dublin 4, Ireland, branch registration number 908705
Quoted 22 lines · Yuto Ohnuki
The da node block header (
xfs_da3_node_hdr) contains a__pad32field that should always be zero. Add a check for this during directory and attribute btree scrubbing.Since old kernels may have written non-zero padding without issues, flag this as an optimization opportunity (preen) rather than corruption.
Signed-off-by Yuto Ohnuki <[email protected]>---
Changes in v2:
- Usexchk_da_set_preeninstead ofxchk_da_set_corruptsince
old kernels may have written non-zero padding without issues.
- Link to v1: https://lore.kernel.org/all/[email protected]/--- fs/xfs/scrub/dabtree.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)fs/xfs/scrub/dabtree.c +0
-0
fs/xfs/scrub/dabtree.c xchk_da_btree_block( · line 462
Quoted 10 lines
fs/xfs/scrub/dabtree.c +6
-1@@ -454,7 +454,12 @@ xchk_da_btree_block( } } -/* XXX: Check hdr3.pad32 once we know how to fix it. */ +if (xfs_has_crc (ip->i_mount)) { +struct xfs_da3_node_hdr *nodehdr3 = blk->bp->b_addr; + +if (be32_to_cpu (nodehdr3->__pad32) !=0 ) +xchk_da_set_preen (ds, level); + }
Endian conversion not necessary on comaprison to zero.
-Dave.
Signature · 2 lines
Dave Chinner [email protected]
Quoted 6 lines · Dave Chinner
Endian conversion not necessary on comaprison to zero.
-Dave.
Signature · 2 lines
Dave Chinner [email protected]
Understood. I'll send v3 without endian conversion.
Thank you for the review.
Yuto
Amazon Web Services EMEA SARL, 38 avenue John F. Kennedy, L-1855 Luxembourg, R.C.S. Luxembourg B186284
Amazon Web Services EMEA SARL, Irish Branch, One Burlington Plaza, Burlington Road, Dublin 4, Ireland, branch registration number 908705