Re: [PATCH 3/2] xfs: free the intent item when allocating recovery transaction fails

Christoph Hellwig
2020-09-17T09:06:48Z

On Thu, Sep 17, 2020 at 12:01:35AM -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
>
> The recovery functions of all four log intent items fail to free the
> intent item if the transaction allocation fails. Fix this.
>
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---
> fs/xfs/xfs_bmap_item.c | 5 ++++-
> fs/xfs/xfs_extfree_item.c | 5 ++++-
> fs/xfs/xfs_refcount_item.c | 5 ++++-
> fs/xfs/xfs_rmap_item.c | 5 ++++-
> 4 files changed, 16 insertions(+), 4 deletions(-)
>
> diff --git a/fs/xfs/xfs_bmap_item.c b/fs/xfs/xfs_bmap_item.c
> index 2b1cf3ed8172..85d18cd708ba 100644
> --- a/fs/xfs/xfs_bmap_item.c
> +++ b/fs/xfs/xfs_bmap_item.c
> @@ -484,8 +484,11 @@ xfs_bui_item_recover(
>
> error = xfs_trans_alloc(mp, &M_RES(mp)->tr_itruncate,
> XFS_EXTENTADD_SPACE_RES(mp, XFS_DATA_FORK), 0, 0, &tp);
> - if (error)
> + if (error) {
> + xfs_bui_release(buip);
> return error;
> + }

This should probably use a common label instead of duplicating the
release three times.

That beind said I don't think we need either the existing or newly
added calls. At the end of log recovery we always call
xlog_recover_cancel_intents, which will release all intents remaining
in the AIL.