[021/111] xfs: report dir/attr block corruption errors to the health system

Message ID	171634532026.2478931.14133508831527496709.stgit@frogsfrogsfrogs (mailing list archive)
State	Superseded, archived
Headers	show Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7AA521DFD0 for <linux-xfs@vger.kernel.org>; Wed, 22 May 2024 02:54:15 +0000 (UTC) Date: Tue, 21 May 2024 19:54:14 -0700 Subject: [PATCH 021/111] xfs: report dir/attr block corruption errors to the health system From: "Darrick J. Wong" <djwong@kernel.org> To: djwong@kernel.org, cem@kernel.org Cc: Christoph Hellwig <hch@lst.de>, linux-xfs@vger.kernel.org Message-ID: <171634532026.2478931.14133508831527496709.stgit@frogsfrogsfrogs> In-Reply-To: <171634531590.2478931.8474978645585392776.stgit@frogsfrogsfrogs> References: <171634531590.2478931.8474978645585392776.stgit@frogsfrogsfrogs> User-Agent: StGit/0.19 Precedence: bulk MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit
Series	[001/111] xfs: convert kmem_zalloc() to kzalloc() \| expand [001/111] xfs: convert kmem_zalloc() to kzalloc() [002/111] xfs: convert kmem_alloc() to kmalloc() [003/111] xfs: convert remaining kmem_free() to kfree() [004/111] xfs: use __GFP_NOLOCKDEP instead of GFP_NOFS [005/111] xfs: use GFP_KERNEL in pure transaction contexts [006/111] xfs: clean up remaining GFP_NOFS users [007/111] xfs: use xfs_defer_alloc a bit more [008/111] xfs: Replace xfs_isilocked with xfs_assert_ilocked [009/111] xfs: create a static name for the dot entry too [010/111] xfs: create a predicate to determine if two xfs_names are the same [011/111] xfs: create a macro for decoding ftypes in tracepoints [012/111] xfs: report the health of quota counts [013/111] xfs: implement live quotacheck inode scan [014/111] xfs: report health of inode link counts [015/111] xfs: teach scrub to check file nlinks [016/111] xfs: separate the marking of sick and checked metadata [017/111] xfs: report fs corruption errors to the health tracking system [018/111] xfs: report ag header corruption errors to the health tracking system [019/111] xfs: report block map corruption errors to the health tracking system [020/111] xfs: report btree block corruption errors to the health system [021/111] xfs: report dir/attr block corruption errors to the health system [022/111] xfs: report inode corruption errors to the health system [023/111] xfs: report realtime metadata corruption errors to the health system [024/111] xfs: report XFS_IS_CORRUPT errors to the health system [025/111] xfs: add secondary and indirect classes to the health tracking system [026/111] xfs: remember sick inodes that get inactivated [027/111] xfs: update health status if we get a clean bill of health [028/111] xfs: consolidate btree block freeing tracepoints [029/111] xfs: consolidate btree block allocation tracepoints [030/111] xfs: set the btree cursor bc_ops in xfs_btree_alloc_cursor [031/111] xfs: drop XFS_BTREE_CRC_BLOCKS [032/111] xfs: encode the btree geometry flags in the btree ops structure [033/111] xfs: remove bc_ino.flags [034/111] xfs: consolidate the xfs_alloc_lookup_* helpers [035/111] xfs: turn the allocbt cursor active field into a btree flag [036/111] xfs: extern some btree ops structures [037/111] xfs: initialize btree blocks using btree_ops structure [038/111] xfs: rename btree block/buffer init functions [039/111] xfs: btree convert xfs_btree_init_block to xfs_btree_init_buf calls [040/111] xfs: remove the unnecessary daddr paramter to _init_block [041/111] xfs: set btree block buffer ops in _init_buf [042/111] xfs: move lru refs to the btree ops structure [043/111] xfs: move the btree stats offset into struct btree_ops [044/111] xfs: factor out a xfs_btree_owner helper [045/111] xfs: factor out a btree block owner check [046/111] xfs: store the btree pointer length in struct xfs_btree_ops [047/111] xfs: split out a btree type from the btree ops geometry flags [048/111] xfs: split the per-btree union in struct xfs_btree_cur [049/111] xfs: create predicate to determine if cursor is at inode root level [050/111] xfs: move comment about two 2 keys per pointer in the rmap btree [051/111] xfs: add a xfs_btree_init_ptr_from_cur [052/111] xfs: don't override bc_ops for staging btrees [053/111] xfs: fold xfs_allocbt_init_common into xfs_allocbt_init_cursor [054/111] xfs: remove xfs_allocbt_stage_cursor [055/111] xfs: fold xfs_inobt_init_common into xfs_inobt_init_cursor [056/111] xfs: remove xfs_inobt_stage_cursor [057/111] xfs: fold xfs_refcountbt_init_common into xfs_refcountbt_init_cursor [058/111] xfs: remove xfs_refcountbt_stage_cursor [059/111] xfs: fold xfs_rmapbt_init_common into xfs_rmapbt_init_cursor [060/111] xfs: remove xfs_rmapbt_stage_cursor [061/111] xfs: make full use of xfs_btree_stage_ifakeroot in xfs_bmbt_stage_cursor [062/111] xfs: make staging file forks explicit [063/111] xfs: fold xfs_bmbt_init_common into xfs_bmbt_init_cursor [064/111] xfs: remove xfs_bmbt_stage_cursor [065/111] xfs: split the agf_roots and agf_levels arrays [066/111] xfs: add a name field to struct xfs_btree_ops [067/111] xfs: add a sick_mask to struct xfs_btree_ops [068/111] xfs: split xfs_allocbt_init_cursor [069/111] xfs: remove xfs_inobt_cur [070/111] xfs: remove the btnum argument to xfs_inobt_count_blocks [071/111] xfs: split xfs_inobt_insert_sprec [072/111] xfs: split xfs_inobt_init_cursor [073/111] xfs: pass a 'bool is_finobt' to xfs_inobt_insert [074/111] xfs: remove xfs_btnum_t [075/111] xfs: simplify xfs_btree_check_sblock_siblings [076/111] xfs: simplify xfs_btree_check_lblock_siblings [077/111] xfs: open code xfs_btree_check_lptr in xfs_bmap_btree_to_extents [078/111] xfs: consolidate btree ptr checking [079/111] xfs: misc cleanups for __xfs_btree_check_sblock [080/111] xfs: remove the crc variable in __xfs_btree_check_lblock [081/111] xfs: tighten up validation of root block in inode forks [082/111] xfs: consolidate btree block verification [083/111] xfs: rename btree helpers that depends on the block number representation [084/111] xfs: factor out a __xfs_btree_check_lblock_hdr helper [085/111] xfs: remove xfs_btree_reada_bufl [086/111] xfs: remove xfs_btree_reada_bufs [087/111] xfs: move and rename xfs_btree_read_bufl [088/111] libxfs: teach buftargs to maintain their own buffer hashtable [089/111] libxfs: add xfile support [090/111] libxfs: partition memfd files to avoid using too many fds [091/111] xfs: teach buftargs to maintain their own buffer hashtable [092/111] libxfs: support in-memory buffer cache targets [093/111] xfs: add a xfs_btree_ptrs_equal helper [094/111] xfs: support in-memory btrees [095/111] xfs: launder in-memory btree buffers before transaction commit [096/111] xfs: create a helper to decide if a file mapping targets the rt volume [097/111] xfs: repair the rmapbt [098/111] xfs: create a shadow rmap btree during rmap repair [099/111] xfs: hook live rmap operations during a repair operation [100/111] xfs: clean up bmap log intent item tracepoint callsites [101/111] xfs: move xfs_bmap_defer_add to xfs_bmap_item.c [102/111] xfs: fix xfs_bunmapi to allow unmapping of partial rt extents [103/111] xfs: add a realtime flag to the bmap update log redo items [104/111] xfs: support deferred bmap updates on the attr fork [105/111] xfs: xfs_bmap_finish_one should map unwritten extents properly [106/111] xfs: move xfs_symlink_remote.c declarations to xfs_symlink_remote.h [107/111] xfs: move remote symlink target read function to libxfs [108/111] xfs: move symlink target write function to libxfs [109/111] xfs: xfs_btree_bload_prep_block() should use __GFP_NOFAIL [110/111] xfs: shrink failure needs to hold AGI buffer [111/111] xfs: allow sunit mount option to repair bad primary sb stripe values

diff --git a/libxfs/util.c b/libxfs/util.c index b45d67065..6c326e84a 100644 --- a/libxfs/util.c +++ b/libxfs/util.c @@ -734,3 +734,5 @@ void xfs_agno_mark_sick(struct xfs_mount *mp, xfs_agnumber_t agno, void xfs_ag_mark_sick(struct xfs_perag *pag, unsigned int mask) { } void xfs_bmap_mark_sick(struct xfs_inode *ip, int whichfork) { } void xfs_btree_mark_sick(struct xfs_btree_cur *cur) { } +void xfs_dirattr_mark_sick(struct xfs_inode *ip, int whichfork) { } +void xfs_da_mark_sick(struct xfs_da_args *args) { } diff --git a/libxfs/xfs_attr_leaf.c b/libxfs/xfs_attr_leaf.c index fdc53451c..a44312cdc 100644 --- a/libxfs/xfs_attr_leaf.c +++ b/libxfs/xfs_attr_leaf.c @@ -26,6 +26,7 @@ #include "xfs_dir2.h" #include "xfs_ag.h" #include "xfs_errortag.h" +#include "xfs_health.h" /* @@ -2340,6 +2341,7 @@ xfs_attr3_leaf_lookup_int( entries = xfs_attr3_leaf_entryp(leaf); if (ichdr.count >= args->geo->blksize / 8) { xfs_buf_mark_corrupt(bp); + xfs_da_mark_sick(args); return -EFSCORRUPTED; } @@ -2359,10 +2361,12 @@ xfs_attr3_leaf_lookup_int( } if (!(probe >= 0 && (!ichdr.count || probe < ichdr.count))) { xfs_buf_mark_corrupt(bp); + xfs_da_mark_sick(args); return -EFSCORRUPTED; } if (!(span <= 4 || be32_to_cpu(entry->hashval) == hashval)) { xfs_buf_mark_corrupt(bp); + xfs_da_mark_sick(args); return -EFSCORRUPTED; } diff --git a/libxfs/xfs_attr_remote.c b/libxfs/xfs_attr_remote.c index 12d1ba9c3..a400a22d3 100644 --- a/libxfs/xfs_attr_remote.c +++ b/libxfs/xfs_attr_remote.c @@ -21,6 +21,7 @@ #include "xfs_attr.h" #include "xfs_attr_remote.h" #include "xfs_trace.h" +#include "xfs_health.h" #define ATTR_RMTVALUE_MAPSIZE 1 /* # of map entries at once */ @@ -275,17 +276,18 @@ xfs_attr3_rmt_hdr_set( */ STATIC int xfs_attr_rmtval_copyout( - struct xfs_mount *mp, - struct xfs_buf *bp, - xfs_ino_t ino, - int *offset, - int *valuelen, - uint8_t **dst) + struct xfs_mount *mp, + struct xfs_buf *bp, + struct xfs_inode *dp, + int *offset, + int *valuelen, + uint8_t **dst) { - char *src = bp->b_addr; - xfs_daddr_t bno = xfs_buf_daddr(bp); - int len = BBTOB(bp->b_length); - int blksize = mp->m_attr_geo->blksize; + char *src = bp->b_addr; + xfs_ino_t ino = dp->i_ino; + xfs_daddr_t bno = xfs_buf_daddr(bp); + int len = BBTOB(bp->b_length); + int blksize = mp->m_attr_geo->blksize; ASSERT(len >= blksize); @@ -301,6 +303,7 @@ xfs_attr_rmtval_copyout( xfs_alert(mp, "remote attribute header mismatch bno/off/len/owner (0x%llx/0x%x/Ox%x/0x%llx)", bno, *offset, byte_cnt, ino); + xfs_dirattr_mark_sick(dp, XFS_ATTR_FORK); return -EFSCORRUPTED; } hdr_size = sizeof(struct xfs_attr3_rmt_hdr); @@ -417,10 +420,12 @@ xfs_attr_rmtval_get( dblkcnt = XFS_FSB_TO_BB(mp, map[i].br_blockcount); error = xfs_buf_read(mp->m_ddev_targp, dblkno, dblkcnt, 0, &bp, &xfs_attr3_rmt_buf_ops); + if (xfs_metadata_is_sick(error)) + xfs_dirattr_mark_sick(args->dp, XFS_ATTR_FORK); if (error) return error; - error = xfs_attr_rmtval_copyout(mp, bp, args->dp->i_ino, + error = xfs_attr_rmtval_copyout(mp, bp, args->dp, &offset, &valuelen, &dst); xfs_buf_relse(bp); diff --git a/libxfs/xfs_da_btree.c b/libxfs/xfs_da_btree.c index 0fea72f33..8ace7622a 100644 --- a/libxfs/xfs_da_btree.c +++ b/libxfs/xfs_da_btree.c @@ -19,6 +19,7 @@ #include "xfs_bmap.h" #include "xfs_attr_leaf.h" #include "xfs_trace.h" +#include "xfs_health.h" /* * xfs_da_btree.c @@ -349,6 +350,8 @@ const struct xfs_buf_ops xfs_da3_node_buf_ops = { static int xfs_da3_node_set_type( struct xfs_trans *tp, + struct xfs_inode *dp, + int whichfork, struct xfs_buf *bp) { struct xfs_da_blkinfo *info = bp->b_addr; @@ -370,6 +373,7 @@ xfs_da3_node_set_type( XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, tp->t_mountp, info, sizeof(*info)); xfs_trans_brelse(tp, bp); + xfs_dirattr_mark_sick(dp, whichfork); return -EFSCORRUPTED; } } @@ -388,7 +392,7 @@ xfs_da3_node_read( &xfs_da3_node_buf_ops); if (error || !*bpp || !tp) return error; - return xfs_da3_node_set_type(tp, *bpp); + return xfs_da3_node_set_type(tp, dp, whichfork, *bpp); } int @@ -405,6 +409,8 @@ xfs_da3_node_read_mapped( error = xfs_trans_read_buf(mp, tp, mp->m_ddev_targp, mappedbno, XFS_FSB_TO_BB(mp, xfs_dabuf_nfsb(mp, whichfork)), 0, bpp, &xfs_da3_node_buf_ops); + if (xfs_metadata_is_sick(error)) + xfs_dirattr_mark_sick(dp, whichfork); if (error || !*bpp) return error; @@ -415,7 +421,7 @@ xfs_da3_node_read_mapped( if (!tp) return 0; - return xfs_da3_node_set_type(tp, *bpp); + return xfs_da3_node_set_type(tp, dp, whichfork, *bpp); } /* @@ -628,6 +634,7 @@ xfs_da3_split( if (node->hdr.info.forw) { if (be32_to_cpu(node->hdr.info.forw) != addblk->blkno) { xfs_buf_mark_corrupt(oldblk->bp); + xfs_da_mark_sick(state->args); error = -EFSCORRUPTED; goto out; } @@ -641,6 +648,7 @@ xfs_da3_split( if (node->hdr.info.back) { if (be32_to_cpu(node->hdr.info.back) != addblk->blkno) { xfs_buf_mark_corrupt(oldblk->bp); + xfs_da_mark_sick(state->args); error = -EFSCORRUPTED; goto out; } @@ -1632,6 +1640,7 @@ xfs_da3_node_lookup_int( if (magic != XFS_DA_NODE_MAGIC && magic != XFS_DA3_NODE_MAGIC) { xfs_buf_mark_corrupt(blk->bp); + xfs_da_mark_sick(args); return -EFSCORRUPTED; } @@ -1647,6 +1656,7 @@ xfs_da3_node_lookup_int( /* Tree taller than we can handle; bail out! */ if (nodehdr.level >= XFS_DA_NODE_MAXDEPTH) { xfs_buf_mark_corrupt(blk->bp); + xfs_da_mark_sick(args); return -EFSCORRUPTED; } @@ -1655,6 +1665,7 @@ xfs_da3_node_lookup_int( expected_level = nodehdr.level - 1; else if (expected_level != nodehdr.level) { xfs_buf_mark_corrupt(blk->bp); + xfs_da_mark_sick(args); return -EFSCORRUPTED; } else expected_level--; @@ -1706,12 +1717,16 @@ xfs_da3_node_lookup_int( } /* We can't point back to the root. */ - if (XFS_IS_CORRUPT(dp->i_mount, blkno == args->geo->leafblk)) + if (XFS_IS_CORRUPT(dp->i_mount, blkno == args->geo->leafblk)) { + xfs_da_mark_sick(args); return -EFSCORRUPTED; + } } - if (XFS_IS_CORRUPT(dp->i_mount, expected_level != 0)) + if (XFS_IS_CORRUPT(dp->i_mount, expected_level != 0)) { + xfs_da_mark_sick(args); return -EFSCORRUPTED; + } /* * A leaf block that ends in the hashval that we are interested in @@ -1729,6 +1744,7 @@ xfs_da3_node_lookup_int( args->blkno = blk->blkno; } else { ASSERT(0); + xfs_da_mark_sick(args); return -EFSCORRUPTED; } if (((retval == -ENOENT) || (retval == -ENOATTR)) && @@ -2295,8 +2311,10 @@ xfs_da3_swap_lastblock( error = xfs_bmap_last_before(tp, dp, &lastoff, w); if (error) return error; - if (XFS_IS_CORRUPT(mp, lastoff == 0)) + if (XFS_IS_CORRUPT(mp, lastoff == 0)) { + xfs_da_mark_sick(args); return -EFSCORRUPTED; + } /* * Read the last block in the btree space. */ @@ -2346,6 +2364,7 @@ xfs_da3_swap_lastblock( if (XFS_IS_CORRUPT(mp, be32_to_cpu(sib_info->forw) != last_blkno || sib_info->magic != dead_info->magic)) { + xfs_da_mark_sick(args); error = -EFSCORRUPTED; goto done; } @@ -2366,6 +2385,7 @@ xfs_da3_swap_lastblock( if (XFS_IS_CORRUPT(mp, be32_to_cpu(sib_info->back) != last_blkno || sib_info->magic != dead_info->magic)) { + xfs_da_mark_sick(args); error = -EFSCORRUPTED; goto done; } @@ -2388,6 +2408,7 @@ xfs_da3_swap_lastblock( xfs_da3_node_hdr_from_disk(dp->i_mount, &par_hdr, par_node); if (XFS_IS_CORRUPT(mp, level >= 0 && level != par_hdr.level + 1)) { + xfs_da_mark_sick(args); error = -EFSCORRUPTED; goto done; } @@ -2399,6 +2420,7 @@ xfs_da3_swap_lastblock( entno++) continue; if (XFS_IS_CORRUPT(mp, entno == par_hdr.count)) { + xfs_da_mark_sick(args); error = -EFSCORRUPTED; goto done; } @@ -2424,6 +2446,7 @@ xfs_da3_swap_lastblock( xfs_trans_brelse(tp, par_buf); par_buf = NULL; if (XFS_IS_CORRUPT(mp, par_blkno == 0)) { + xfs_da_mark_sick(args); error = -EFSCORRUPTED; goto done; } @@ -2433,6 +2456,7 @@ xfs_da3_swap_lastblock( par_node = par_buf->b_addr; xfs_da3_node_hdr_from_disk(dp->i_mount, &par_hdr, par_node); if (XFS_IS_CORRUPT(mp, par_hdr.level != level)) { + xfs_da_mark_sick(args); error = -EFSCORRUPTED; goto done; } @@ -2563,6 +2587,7 @@ xfs_dabuf_map( invalid_mapping: /* Caller ok with no mapping. */ if (XFS_IS_CORRUPT(mp, !(flags & XFS_DABUF_MAP_HOLE_OK))) { + xfs_dirattr_mark_sick(dp, whichfork); error = -EFSCORRUPTED; if (xfs_error_level >= XFS_ERRLEVEL_LOW) { xfs_alert(mp, "%s: bno %u inode %llu", @@ -2644,6 +2669,8 @@ xfs_da_read_buf( error = xfs_trans_read_buf_map(mp, tp, mp->m_ddev_targp, mapp, nmap, 0, &bp, ops); + if (xfs_metadata_is_sick(error)) + xfs_dirattr_mark_sick(dp, whichfork); if (error) goto out_free; diff --git a/libxfs/xfs_dir2.c b/libxfs/xfs_dir2.c index ac372bf2a..530c3e22a 100644 --- a/libxfs/xfs_dir2.c +++ b/libxfs/xfs_dir2.c @@ -17,6 +17,7 @@ #include "xfs_dir2_priv.h" #include "xfs_errortag.h" #include "xfs_trace.h" +#include "xfs_health.h" const struct xfs_name xfs_name_dotdot = { .name = (const unsigned char *)"..", @@ -625,8 +626,10 @@ xfs_dir2_isblock( return 0; *isblock = true; - if (XFS_IS_CORRUPT(mp, args->dp->i_disk_size != args->geo->blksize)) + if (XFS_IS_CORRUPT(mp, args->dp->i_disk_size != args->geo->blksize)) { + xfs_da_mark_sick(args); return -EFSCORRUPTED; + } return 0; } diff --git a/libxfs/xfs_dir2_block.c b/libxfs/xfs_dir2_block.c index aed3c14a8..9d87735e7 100644 --- a/libxfs/xfs_dir2_block.c +++ b/libxfs/xfs_dir2_block.c @@ -17,6 +17,7 @@ #include "xfs_dir2.h" #include "xfs_dir2_priv.h" #include "xfs_trace.h" +#include "xfs_health.h" /* * Local function prototypes. @@ -149,6 +150,7 @@ xfs_dir3_block_read( __xfs_buf_mark_corrupt(*bpp, fa); xfs_trans_brelse(tp, *bpp); *bpp = NULL; + xfs_dirattr_mark_sick(dp, XFS_DATA_FORK); return -EFSCORRUPTED; } diff --git a/libxfs/xfs_dir2_data.c b/libxfs/xfs_dir2_data.c index 4e207986b..aaf3f62af 100644 --- a/libxfs/xfs_dir2_data.c +++ b/libxfs/xfs_dir2_data.c @@ -15,6 +15,7 @@ #include "xfs_dir2.h" #include "xfs_dir2_priv.h" #include "xfs_trans.h" +#include "xfs_health.h" static xfs_failaddr_t xfs_dir2_data_freefind_verify( struct xfs_dir2_data_hdr *hdr, struct xfs_dir2_data_free *bf, @@ -430,6 +431,7 @@ xfs_dir3_data_read( __xfs_buf_mark_corrupt(*bpp, fa); xfs_trans_brelse(tp, *bpp); *bpp = NULL; + xfs_dirattr_mark_sick(dp, XFS_DATA_FORK); return -EFSCORRUPTED; } @@ -1195,6 +1197,7 @@ xfs_dir2_data_use_free( corrupt: xfs_corruption_error(__func__, XFS_ERRLEVEL_LOW, args->dp->i_mount, hdr, sizeof(*hdr), __FILE__, __LINE__, fa); + xfs_da_mark_sick(args); return -EFSCORRUPTED; } diff --git a/libxfs/xfs_dir2_leaf.c b/libxfs/xfs_dir2_leaf.c index 5da66006c..80cea8a27 100644 --- a/libxfs/xfs_dir2_leaf.c +++ b/libxfs/xfs_dir2_leaf.c @@ -17,6 +17,7 @@ #include "xfs_dir2_priv.h" #include "xfs_trace.h" #include "xfs_trans.h" +#include "xfs_health.h" /* * Local function declarations. @@ -1391,8 +1392,10 @@ xfs_dir2_leaf_removename( bestsp = xfs_dir2_leaf_bests_p(ltp); if (be16_to_cpu(bestsp[db]) != oldbest) { xfs_buf_mark_corrupt(lbp); + xfs_da_mark_sick(args); return -EFSCORRUPTED; } + /* * Mark the former data entry unused. */ diff --git a/libxfs/xfs_dir2_node.c b/libxfs/xfs_dir2_node.c index c0eb335c3..44c8f3f2b 100644 --- a/libxfs/xfs_dir2_node.c +++ b/libxfs/xfs_dir2_node.c @@ -17,6 +17,7 @@ #include "xfs_dir2_priv.h" #include "xfs_trace.h" #include "xfs_trans.h" +#include "xfs_health.h" /* * Function declarations. @@ -228,6 +229,7 @@ __xfs_dir3_free_read( __xfs_buf_mark_corrupt(*bpp, fa); xfs_trans_brelse(tp, *bpp); *bpp = NULL; + xfs_dirattr_mark_sick(dp, XFS_DATA_FORK); return -EFSCORRUPTED; } @@ -440,6 +442,7 @@ xfs_dir2_leaf_to_node( if (be32_to_cpu(ltp->bestcount) > (uint)dp->i_disk_size / args->geo->blksize) { xfs_buf_mark_corrupt(lbp); + xfs_da_mark_sick(args); return -EFSCORRUPTED; } @@ -514,6 +517,7 @@ xfs_dir2_leafn_add( */ if (index < 0) { xfs_buf_mark_corrupt(bp); + xfs_da_mark_sick(args); return -EFSCORRUPTED; } @@ -733,6 +737,7 @@ xfs_dir2_leafn_lookup_for_addname( cpu_to_be16(NULLDATAOFF))) { if (curfdb != newfdb) xfs_trans_brelse(tp, curbp); + xfs_da_mark_sick(args); return -EFSCORRUPTED; } curfdb = newfdb; @@ -801,6 +806,7 @@ xfs_dir2_leafn_lookup_for_entry( xfs_dir3_leaf_check(dp, bp); if (leafhdr.count <= 0) { xfs_buf_mark_corrupt(bp); + xfs_da_mark_sick(args); return -EFSCORRUPTED; } @@ -1736,6 +1742,7 @@ xfs_dir2_node_add_datablk( } else { xfs_alert(mp, " ... fblk is NULL"); } + xfs_da_mark_sick(args); return -EFSCORRUPTED; } diff --git a/libxfs/xfs_health.h b/libxfs/xfs_health.h index 8f566a787..ff98c0321 100644 --- a/libxfs/xfs_health.h +++ b/libxfs/xfs_health.h @@ -38,6 +38,7 @@ struct xfs_perag; struct xfs_inode; struct xfs_fsop_geom; struct xfs_btree_cur; +struct xfs_da_args; /* Observable health issues for metadata spanning the entire filesystem. */ #define XFS_SICK_FS_COUNTERS (1 << 0) /* summary counters */ @@ -162,6 +163,8 @@ void xfs_inode_measure_sickness(struct xfs_inode *ip, unsigned int *sick, void xfs_health_unmount(struct xfs_mount *mp); void xfs_bmap_mark_sick(struct xfs_inode *ip, int whichfork); void xfs_btree_mark_sick(struct xfs_btree_cur *cur); +void xfs_dirattr_mark_sick(struct xfs_inode *ip, int whichfork); +void xfs_da_mark_sick(struct xfs_da_args *args); /* Now some helpers. */

[021/111] xfs: report dir/attr block corruption errors to the health system

Commit Message

Patch