From: Darrick J. Wong Date: Wed, 29 May 2024 04:11:02 +0000 (-0700) Subject: xfs: adjust xfs_bmap_add_attrfork for metadir X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d4645b9ab3d5bb7bb6bf1915f885e727a2ca2141;p=users%2Fhch%2Fxfsprogs.git xfs: adjust xfs_bmap_add_attrfork for metadir Online repair might use the xfs_bmap_add_attrfork to repair a file in the metadata directory tree if (say) the metadata file lacks the correct parent pointers. In that case, it is not correct to check that the file is dqattached -- metadata files must be not have /any/ dquot attached at all. Signed-off-by: Darrick J. Wong --- diff --git a/libxfs/xfs_attr.c b/libxfs/xfs_attr.c index 9e1cce577..f2450f8ac 100644 --- a/libxfs/xfs_attr.c +++ b/libxfs/xfs_attr.c @@ -952,7 +952,10 @@ xfs_attr_add_fork( unsigned int blks; /* space reservation */ int error; /* error return value */ - ASSERT(!XFS_NOT_DQATTACHED(mp, ip)); + if (xfs_is_metadir_inode(ip)) + ASSERT(XFS_IS_DQDETACHED(ip)); + else + ASSERT(!XFS_NOT_DQATTACHED(mp, ip)); blks = XFS_ADDAFORK_SPACE_RES(mp); diff --git a/libxfs/xfs_bmap.c b/libxfs/xfs_bmap.c index 4b10f169f..141d2ee0b 100644 --- a/libxfs/xfs_bmap.c +++ b/libxfs/xfs_bmap.c @@ -1036,7 +1036,10 @@ xfs_bmap_add_attrfork( int error; /* error return value */ xfs_assert_ilocked(ip, XFS_ILOCK_EXCL); - ASSERT(!XFS_NOT_DQATTACHED(mp, ip)); + if (xfs_is_metadir_inode(ip)) + ASSERT(XFS_IS_DQDETACHED(ip)); + else + ASSERT(!XFS_NOT_DQATTACHED(mp, ip)); ASSERT(!xfs_inode_has_attr_fork(ip)); xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);