From: Dave Chinner Date: Fri, 10 Feb 2023 17:12:06 +0000 (+1100) Subject: xfs: don't assert fail on transaction cancel with deferred ops X-Git-Tag: v6.6.7~3376^2~2^2~36 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=55d5c3a386d74d3f374023c8fa386f524a9192e8;p=platform%2Fkernel%2Flinux-starfive.git xfs: don't assert fail on transaction cancel with deferred ops We can error out of an allocation transaction when updating BMBT blocks when things go wrong. This can be a btree corruption, and unexpected ENOSPC, etc. In these cases, we already have deferred ops queued for the first allocation that has been done, and we just want to cancel out the transaction and shut down the filesystem on error. In fact, we do just that for production systems - the assert that we can't have a transaction with defer ops attached unless we are already shut down is bogus and gets in the way of debugging whatever issue is actually causing the transaction to be cancelled. Remove the assert because it is causing spurious test failures to hang test machines. Signed-off-by: Dave Chinner Reviewed-by: Allison Henderson Reviewed-by: Darrick J. Wong --- diff --git a/fs/xfs/xfs_trans.c b/fs/xfs/xfs_trans.c index 53ab544..8afc0c0 100644 --- a/fs/xfs/xfs_trans.c +++ b/fs/xfs/xfs_trans.c @@ -1078,10 +1078,10 @@ xfs_trans_cancel( /* * It's never valid to cancel a transaction with deferred ops attached, * because the transaction is effectively dirty. Complain about this - * loudly before freeing the in-memory defer items. + * loudly before freeing the in-memory defer items and shutting down the + * filesystem. */ if (!list_empty(&tp->t_dfops)) { - ASSERT(xfs_is_shutdown(mp) || list_empty(&tp->t_dfops)); ASSERT(tp->t_flags & XFS_TRANS_PERM_LOG_RES); dirty = true; xfs_defer_cancel(tp);