Re: [PATCH v2 2/3] xfs: splice unsorted log items back to the transaction after the loop

["Darrick J. Wong" <djwong@kernel.org>]

On Wed, Jul 01, 2026 at 08:38:32AM -0700, Weiming Shi wrote:
> On error, xlog_recover_reorder_trans() splices the leftover sort_list
> items back to trans->r_itemq inside the loop before breaking out.  The
> loop tail already splices the per-fate lists back, so do sort_list there
> too, guarded by the assert that used to sit after the loop.
> 
> No functional change.  It drops the duplicated splice so the next patch
> can add another error case without repeating it.
> 
> Signed-off-by: Weiming Shi <bestswngs@gmail.com>
> ---
>  fs/xfs/xfs_log_recover.c | 16 +++++++++-------
>  1 file changed, 9 insertions(+), 7 deletions(-)
> 
> diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
> index a1b373c68f0e..5347f6a5ec42 100644
> --- a/fs/xfs/xfs_log_recover.c
> +++ b/fs/xfs/xfs_log_recover.c
> @@ -1912,12 +1912,6 @@ xlog_recover_reorder_trans(
>  			xfs_warn(log->l_mp,
>  				"%s: unrecognized type of log operation (%d)",
>  				__func__, ITEM_TYPE(item));
> -			/*
> -			 * return the remaining items back to the transaction
> -			 * item list so they can be freed in caller.
> -			 */
> -			if (!list_empty(&sort_list))
> -				list_splice_init(&sort_list, &trans->r_itemq);
>  			error = -EFSCORRUPTED;
>  			break;
>  		}
> @@ -1945,7 +1939,15 @@ xlog_recover_reorder_trans(
>  		}
>  	}
>  
> -	ASSERT(list_empty(&sort_list));
> +	/*
> +	 * Return the remaining items back to the transaction item list so they
> +	 * can be freed in caller.  This should only happen when we encountered

s/encountered/encounter/

(same verb tense across a sentence)

> +	 * an error.
> +	 */
> +	if (!list_empty(&sort_list)) {
> +		ASSERT(error);

This otherwise looks fine to me.
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>

--D

> +		list_splice_init(&sort_list, &trans->r_itemq);
> +	}
>  	if (!list_empty(&buffer_list))
>  		list_splice(&buffer_list, &trans->r_itemq);
>  	if (!list_empty(&item_list))
> -- 
> 2.43.0
> 
>