From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B89A9C432C0 for ; Wed, 20 Nov 2019 16:57:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6CE202071F for ; Wed, 20 Nov 2019 16:57:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="Da0nCiTK" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728298AbfKTQ5R (ORCPT ); Wed, 20 Nov 2019 11:57:17 -0500 Received: from userp2130.oracle.com ([156.151.31.86]:41234 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728026AbfKTQ5R (ORCPT ); Wed, 20 Nov 2019 11:57:17 -0500 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.27/8.16.0.27) with SMTP id xAKGu95Q120061; Wed, 20 Nov 2019 16:57:12 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=date : from : to : cc : subject : message-id : references : mime-version : content-type : in-reply-to; s=corp-2019-08-05; bh=zGO/lkaPzqsP+reHJEqZF3PaXumU8p/ygRYHtdN4imE=; b=Da0nCiTKV7ebbR6IUMpRyjUlJbtskyU49a7QkJ28dtvK5DMlANPvEf31hFrOxDZP5hEj dVDzSgEU679SyOj38+10sfQTW19wEteu8L80kHGteiBghnQsA/07+LaTcStS9ITDZQCJ MzPRs1ED1KrG2/6Df4SqUVlat9Gn5hrVxb1DxtaByzcV570wM95sgRrN9W8oL7jC/lGz GAZRbviJxhrWrC0gT2KsuDgOJXB90j9WUNZJLfXZtEzPOQ2TVVU9cfkOdBPd6MUovnT1 hb86rlrY5xwDyT5oX83jobgA3Sfn/dYQ+hAQmTI4fBWEitmcD/llhQhrv9ZMNSxpdx6X 1A== Received: from aserp3020.oracle.com (aserp3020.oracle.com [141.146.126.70]) by userp2130.oracle.com with ESMTP id 2wa8htxw3n-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 20 Nov 2019 16:57:12 +0000 Received: from pps.filterd (aserp3020.oracle.com [127.0.0.1]) by aserp3020.oracle.com (8.16.0.27/8.16.0.27) with SMTP id xAKGrum1179836; Wed, 20 Nov 2019 16:55:11 GMT Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by aserp3020.oracle.com with ESMTP id 2wcemgrj6v-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 20 Nov 2019 16:55:11 +0000 Received: from abhmp0003.oracle.com (abhmp0003.oracle.com [141.146.116.9]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id xAKGt9Yn028227; Wed, 20 Nov 2019 16:55:09 GMT Received: from localhost (/67.169.218.210) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 20 Nov 2019 08:55:09 -0800 Date: Wed, 20 Nov 2019 08:55:08 -0800 From: "Darrick J. Wong" To: Brian Foster Cc: linux-xfs@vger.kernel.org Subject: Re: [PATCH 5/9] xfs: report dir/attr block corruption errors to the health system Message-ID: <20191120165508.GK6219@magnolia> References: <157375555426.3692735.1357467392517392169.stgit@magnolia> <157375558620.3692735.5123638007449434510.stgit@magnolia> <20191120161147.GE15542@bfoster> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20191120161147.GE15542@bfoster> User-Agent: Mutt/1.9.4 (2018-02-28) X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9446 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=2 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1911140001 definitions=main-1911200145 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9446 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=2 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1911140001 definitions=main-1911200145 Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org On Wed, Nov 20, 2019 at 11:11:47AM -0500, Brian Foster wrote: > On Thu, Nov 14, 2019 at 10:19:46AM -0800, Darrick J. Wong wrote: > > From: Darrick J. Wong > > > > Whenever we encounter corrupt directory or extended attribute blocks, we > > should report that to the health monitoring system for later reporting. > > > > Signed-off-by: Darrick J. Wong > > --- > > fs/xfs/libxfs/xfs_attr_leaf.c | 5 ++++- > > fs/xfs/libxfs/xfs_attr_remote.c | 27 ++++++++++++++++----------- > > fs/xfs/libxfs/xfs_da_btree.c | 29 ++++++++++++++++++++++++++--- > > fs/xfs/libxfs/xfs_dir2.c | 5 ++++- > > fs/xfs/libxfs/xfs_dir2_data.c | 2 ++ > > fs/xfs/libxfs/xfs_dir2_leaf.c | 3 +++ > > fs/xfs/libxfs/xfs_dir2_node.c | 7 +++++++ > > fs/xfs/libxfs/xfs_health.h | 3 +++ > > fs/xfs/xfs_attr_inactive.c | 4 ++++ > > fs/xfs/xfs_attr_list.c | 16 +++++++++++++--- > > fs/xfs/xfs_dir2_readdir.c | 6 +++++- > > fs/xfs/xfs_health.c | 39 +++++++++++++++++++++++++++++++++++++++ > > 12 files changed, 126 insertions(+), 20 deletions(-) > > > > > ... > > diff --git a/fs/xfs/libxfs/xfs_da_btree.c b/fs/xfs/libxfs/xfs_da_btree.c > > index e424b004e3cb..a17622dadf00 100644 > > --- a/fs/xfs/libxfs/xfs_da_btree.c > > +++ b/fs/xfs/libxfs/xfs_da_btree.c > ... > > @@ -1589,6 +1593,7 @@ xfs_da3_node_lookup_int( > > > > if (magic != XFS_DA_NODE_MAGIC && magic != XFS_DA3_NODE_MAGIC) { > > xfs_buf_corruption_error(blk->bp); > > + xfs_da_mark_sick(args); > > return -EFSCORRUPTED; > > } > > > > @@ -1604,6 +1609,7 @@ xfs_da3_node_lookup_int( > > /* Tree taller than we can handle; bail out! */ > > if (nodehdr.level >= XFS_DA_NODE_MAXDEPTH) { > > xfs_buf_corruption_error(blk->bp); > > + xfs_da_mark_sick(args); > > return -EFSCORRUPTED; > > } > > > > @@ -1612,6 +1618,7 @@ xfs_da3_node_lookup_int( > > expected_level = nodehdr.level - 1; > > else if (expected_level != nodehdr.level) { > > xfs_buf_corruption_error(blk->bp); > > + xfs_da_mark_sick(args); > > return -EFSCORRUPTED; > > } else > > expected_level--; > > @@ -1663,12 +1670,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 > > @@ -1686,6 +1697,7 @@ xfs_da3_node_lookup_int( > > args->blkno = blk->blkno; > > } else { > > ASSERT(0); > > + xfs_da_mark_sick(args); > > return -EFSCORRUPTED; > > } > > I'm just kind of skimming through the rest for general feedback at this > point given previous comments, but it might be nice to start using exit > labels at some of these places where we're enlarging and duplicating the > error path for particular errors. Yeah. This current iteration is pretty wordy since I used coccinelle to find all the EFSCORRUPTED clauses and inject the appropriate _mark_sick call. > It's not so much about the code in > these patches, but rather to hopefully ease maintaining these state bits > properly in new code where devs/reviewers might not know much about > scrub state or have it in mind. Short of having some kind of generic > helper to handle corruption state, ISTM that the combination of using > verifiers where possible and common exit labels anywhere else we > generate -EFSCORRUPTED at multiple places within some function could > shrink these patches a bit.. Eric suggested on IRC that maybe the _mark_sick functions should return EFSCORRUPTED so that we could at least collapse that to: if (XFS_IS_CORRUPT(...)) { error = xfs_da_mark_sick(...); goto barf; } However, doing it the wordy way I've done it has the neat effects (IMHO) that you can find all the places where xfs decides some metadata is corrupt by grepping for EFSCORRUPTED, and confirm that each place it does that also has a corresponding _mark_sick call. I guess you could create a dorky shouty wrapper to maintain that greppy property: #define XFS_DA_EFSCORRUPTED(...) \ (xfs_da_mark_sick(...), -EFSCORRUPTED) But... that might be stylistically undesirable. OTOH I guess it wouldn't be so bad either to do: if (XFS_IS_CORRUPT(...)) { error = -EFSCORRUPTED; goto bad; } if (XFS_IS_CORRUPT(...)) { error = -EFSCORRUPTED; goto bad; } return 0; bad: if (error == -EFSCORRUPTED) xfs_da_mark_sick(...); return error; Or using the shouty macro above: if (XFS_IS_CORRUPT(...)) { error = XFS_DA_EFSCORRUPTED(...); goto bad; } if (XFS_IS_CORRUPT(...)) { error = XFS_DA_EFSCORRUPTED(...); goto bad; } bad: return error; I'll think about that. It doesn't sound so bad when coding it up in this email. --D > > Brian > > > if (((retval == -ENOENT) || (retval == -ENOATTR)) && > > @@ -2250,8 +2262,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. > > */ > > @@ -2300,6 +2314,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; > > } > > @@ -2320,6 +2335,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; > > } > > @@ -2342,6 +2358,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; > > } > > @@ -2353,6 +2370,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; > > } > > @@ -2378,6 +2396,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; > > } > > @@ -2387,6 +2406,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; > > } > > @@ -2601,6 +2621,7 @@ xfs_dabuf_map( > > irecs[i].br_state); > > } > > } > > + xfs_dirattr_mark_sick(dp, whichfork); > > error = -EFSCORRUPTED; > > goto out; > > } > > @@ -2693,6 +2714,8 @@ xfs_da_read_buf( > > error = xfs_trans_read_buf_map(dp->i_mount, trans, > > dp->i_mount->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/fs/xfs/libxfs/xfs_dir2.c b/fs/xfs/libxfs/xfs_dir2.c > > index 0aa87cbde49e..e1aa411a1b8b 100644 > > --- a/fs/xfs/libxfs/xfs_dir2.c > > +++ b/fs/xfs/libxfs/xfs_dir2.c > > @@ -18,6 +18,7 @@ > > #include "xfs_errortag.h" > > #include "xfs_error.h" > > #include "xfs_trace.h" > > +#include "xfs_health.h" > > > > struct xfs_name xfs_name_dotdot = { (unsigned char *)"..", 2, XFS_DIR3_FT_DIR }; > > > > @@ -608,8 +609,10 @@ xfs_dir2_isblock( > > rval = XFS_FSB_TO_B(args->dp->i_mount, last) == args->geo->blksize; > > if (XFS_IS_CORRUPT(args->dp->i_mount, > > rval != 0 && > > - args->dp->i_d.di_size != args->geo->blksize)) > > + args->dp->i_d.di_size != args->geo->blksize)) { > > + xfs_da_mark_sick(args); > > return -EFSCORRUPTED; > > + } > > *vp = rval; > > return 0; > > } > > diff --git a/fs/xfs/libxfs/xfs_dir2_data.c b/fs/xfs/libxfs/xfs_dir2_data.c > > index a6eb71a62b53..80cc9c7ea4e5 100644 > > --- a/fs/xfs/libxfs/xfs_dir2_data.c > > +++ b/fs/xfs/libxfs/xfs_dir2_data.c > > @@ -18,6 +18,7 @@ > > #include "xfs_trans.h" > > #include "xfs_buf_item.h" > > #include "xfs_log.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, > > @@ -1170,6 +1171,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/fs/xfs/libxfs/xfs_dir2_leaf.c b/fs/xfs/libxfs/xfs_dir2_leaf.c > > index 73edd96ce0ac..32d17420fff3 100644 > > --- a/fs/xfs/libxfs/xfs_dir2_leaf.c > > +++ b/fs/xfs/libxfs/xfs_dir2_leaf.c > > @@ -19,6 +19,7 @@ > > #include "xfs_trace.h" > > #include "xfs_trans.h" > > #include "xfs_buf_item.h" > > +#include "xfs_health.h" > > > > /* > > * Local function declarations. > > @@ -1386,8 +1387,10 @@ xfs_dir2_leaf_removename( > > bestsp = xfs_dir2_leaf_bests_p(ltp); > > if (be16_to_cpu(bestsp[db]) != oldbest) { > > xfs_buf_corruption_error(lbp); > > + xfs_da_mark_sick(args); > > return -EFSCORRUPTED; > > } > > + > > /* > > * Mark the former data entry unused. > > */ > > diff --git a/fs/xfs/libxfs/xfs_dir2_node.c b/fs/xfs/libxfs/xfs_dir2_node.c > > index 3a8b0625a08b..e0f3ab254a1a 100644 > > --- a/fs/xfs/libxfs/xfs_dir2_node.c > > +++ b/fs/xfs/libxfs/xfs_dir2_node.c > > @@ -20,6 +20,7 @@ > > #include "xfs_trans.h" > > #include "xfs_buf_item.h" > > #include "xfs_log.h" > > +#include "xfs_health.h" > > > > /* > > * Function declarations. > > @@ -228,6 +229,7 @@ __xfs_dir3_free_read( > > if (fa) { > > xfs_verifier_error(*bpp, -EFSCORRUPTED, fa); > > xfs_trans_brelse(tp, *bpp); > > + 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_d.di_size / args->geo->blksize) { > > xfs_buf_corruption_error(lbp); > > + xfs_da_mark_sick(args); > > return -EFSCORRUPTED; > > } > > > > @@ -514,6 +517,7 @@ xfs_dir2_leafn_add( > > */ > > if (index < 0) { > > xfs_buf_corruption_error(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_corruption_error(bp); > > + xfs_da_mark_sick(args); > > return -EFSCORRUPTED; > > } > > > > @@ -1737,6 +1743,7 @@ xfs_dir2_node_add_datablk( > > } else { > > xfs_alert(mp, " ... fblk is NULL"); > > } > > + xfs_da_mark_sick(args); > > return -EFSCORRUPTED; > > } > > > > diff --git a/fs/xfs/libxfs/xfs_health.h b/fs/xfs/libxfs/xfs_health.h > > index 2049419e9555..d9404cd3d09b 100644 > > --- a/fs/xfs/libxfs/xfs_health.h > > +++ b/fs/xfs/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 */ > > @@ -141,6 +142,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. */ > > > > diff --git a/fs/xfs/xfs_attr_inactive.c b/fs/xfs/xfs_attr_inactive.c > > index a78c501f6fb1..429a97494ffa 100644 > > --- a/fs/xfs/xfs_attr_inactive.c > > +++ b/fs/xfs/xfs_attr_inactive.c > > @@ -23,6 +23,7 @@ > > #include "xfs_quota.h" > > #include "xfs_dir2.h" > > #include "xfs_error.h" > > +#include "xfs_health.h" > > > > /* > > * Look at all the extents for this logical region, > > @@ -209,6 +210,7 @@ xfs_attr3_node_inactive( > > if (level > XFS_DA_NODE_MAXDEPTH) { > > xfs_trans_brelse(*trans, bp); /* no locks for later trans */ > > xfs_buf_corruption_error(bp); > > + xfs_dirattr_mark_sick(dp, XFS_ATTR_FORK); > > return -EFSCORRUPTED; > > } > > > > @@ -256,6 +258,7 @@ xfs_attr3_node_inactive( > > error = xfs_attr3_leaf_inactive(trans, dp, child_bp); > > break; > > default: > > + xfs_dirattr_mark_sick(dp, XFS_ATTR_FORK); > > xfs_buf_corruption_error(child_bp); > > xfs_trans_brelse(*trans, child_bp); > > error = -EFSCORRUPTED; > > @@ -342,6 +345,7 @@ xfs_attr3_root_inactive( > > error = xfs_attr3_leaf_inactive(trans, dp, bp); > > break; > > default: > > + xfs_dirattr_mark_sick(dp, XFS_ATTR_FORK); > > error = -EFSCORRUPTED; > > xfs_buf_corruption_error(bp); > > xfs_trans_brelse(*trans, bp); > > diff --git a/fs/xfs/xfs_attr_list.c b/fs/xfs/xfs_attr_list.c > > index 7a099df88a0c..1a2a3d4ce422 100644 > > --- a/fs/xfs/xfs_attr_list.c > > +++ b/fs/xfs/xfs_attr_list.c > > @@ -21,6 +21,7 @@ > > #include "xfs_error.h" > > #include "xfs_trace.h" > > #include "xfs_dir2.h" > > +#include "xfs_health.h" > > > > STATIC int > > xfs_attr_shortform_compare(const void *a, const void *b) > > @@ -88,8 +89,10 @@ xfs_attr_shortform_list( > > for (i = 0, sfe = &sf->list[0]; i < sf->hdr.count; i++) { > > if (XFS_IS_CORRUPT(context->dp->i_mount, > > !xfs_attr_namecheck(sfe->nameval, > > - sfe->namelen))) > > + sfe->namelen))) { > > + xfs_dirattr_mark_sick(dp, XFS_ATTR_FORK); > > return -EFSCORRUPTED; > > + } > > context->put_listent(context, > > sfe->flags, > > sfe->nameval, > > @@ -131,6 +134,7 @@ xfs_attr_shortform_list( > > context->dp->i_mount, sfe, > > sizeof(*sfe)); > > kmem_free(sbuf); > > + xfs_dirattr_mark_sick(dp, XFS_ATTR_FORK); > > return -EFSCORRUPTED; > > } > > > > @@ -181,6 +185,7 @@ xfs_attr_shortform_list( > > if (XFS_IS_CORRUPT(context->dp->i_mount, > > !xfs_attr_namecheck(sbp->name, > > sbp->namelen))) { > > + xfs_dirattr_mark_sick(dp, XFS_ATTR_FORK); > > error = -EFSCORRUPTED; > > goto out; > > } > > @@ -268,8 +273,10 @@ xfs_attr_node_list_lookup( > > return 0; > > > > /* We can't point back to the root. */ > > - if (XFS_IS_CORRUPT(mp, cursor->blkno == 0)) > > + if (XFS_IS_CORRUPT(mp, cursor->blkno == 0)) { > > + xfs_dirattr_mark_sick(dp, XFS_ATTR_FORK); > > return -EFSCORRUPTED; > > + } > > } > > > > if (expected_level != 0) > > @@ -281,6 +288,7 @@ xfs_attr_node_list_lookup( > > out_corruptbuf: > > xfs_buf_corruption_error(bp); > > xfs_trans_brelse(tp, bp); > > + xfs_dirattr_mark_sick(dp, XFS_ATTR_FORK); > > return -EFSCORRUPTED; > > } > > > > @@ -471,8 +479,10 @@ xfs_attr3_leaf_list_int( > > } > > > > if (XFS_IS_CORRUPT(context->dp->i_mount, > > - !xfs_attr_namecheck(name, namelen))) > > + !xfs_attr_namecheck(name, namelen))) { > > + xfs_dirattr_mark_sick(context->dp, XFS_ATTR_FORK); > > return -EFSCORRUPTED; > > + } > > context->put_listent(context, entry->flags, > > name, namelen, valuelen); > > if (context->seen_enough) > > diff --git a/fs/xfs/xfs_dir2_readdir.c b/fs/xfs/xfs_dir2_readdir.c > > index 95bc9ef8f5f9..715ded503334 100644 > > --- a/fs/xfs/xfs_dir2_readdir.c > > +++ b/fs/xfs/xfs_dir2_readdir.c > > @@ -18,6 +18,7 @@ > > #include "xfs_bmap.h" > > #include "xfs_trans.h" > > #include "xfs_error.h" > > +#include "xfs_health.h" > > > > /* > > * Directory file type support functions > > @@ -119,8 +120,10 @@ xfs_dir2_sf_getdents( > > ctx->pos = off & 0x7fffffff; > > if (XFS_IS_CORRUPT(dp->i_mount, > > !xfs_dir2_namecheck(sfep->name, > > - sfep->namelen))) > > + sfep->namelen))) { > > + xfs_dirattr_mark_sick(dp, XFS_DATA_FORK); > > return -EFSCORRUPTED; > > + } > > if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino, > > xfs_dir3_get_dtype(mp, filetype))) > > return 0; > > @@ -461,6 +464,7 @@ xfs_dir2_leaf_getdents( > > if (XFS_IS_CORRUPT(dp->i_mount, > > !xfs_dir2_namecheck(dep->name, > > dep->namelen))) { > > + xfs_dirattr_mark_sick(dp, XFS_DATA_FORK); > > error = -EFSCORRUPTED; > > break; > > } > > diff --git a/fs/xfs/xfs_health.c b/fs/xfs/xfs_health.c > > index 1f09027c55ad..c1b6e8fb72ec 100644 > > --- a/fs/xfs/xfs_health.c > > +++ b/fs/xfs/xfs_health.c > > @@ -15,6 +15,8 @@ > > #include "xfs_trace.h" > > #include "xfs_health.h" > > #include "xfs_btree.h" > > +#include "xfs_da_format.h" > > +#include "xfs_da_btree.h" > > > > /* > > * Warn about metadata corruption that we detected but haven't fixed, and > > @@ -517,3 +519,40 @@ xfs_btree_mark_sick( > > > > xfs_agno_mark_sick(cur->bc_mp, cur->bc_private.a.agno, mask); > > } > > + > > +/* > > + * Record observations of dir/attr btree corruption with the health tracking > > + * system. > > + */ > > +void > > +xfs_dirattr_mark_sick( > > + struct xfs_inode *ip, > > + int whichfork) > > +{ > > + unsigned int mask; > > + > > + switch (whichfork) { > > + case XFS_DATA_FORK: > > + mask = XFS_SICK_INO_DIR; > > + break; > > + case XFS_ATTR_FORK: > > + mask = XFS_SICK_INO_XATTR; > > + break; > > + default: > > + ASSERT(0); > > + return; > > + } > > + > > + xfs_inode_mark_sick(ip, mask); > > +} > > + > > +/* > > + * Record observations of dir/attr btree corruption with the health tracking > > + * system. > > + */ > > +void > > +xfs_da_mark_sick( > > + struct xfs_da_args *args) > > +{ > > + xfs_dirattr_mark_sick(args->dp, args->whichfork); > > +} > > >