Re: [RFC PATCH 2/3] xfs: enable xfs_trans_cancel() to report and error code

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

On Fri, Sep 04, 2026 at 01:32:22PM +0200, cem@kernel.org wrote:
> From: Carlos Maiolino <cem@kernel.org>
> 
> Once in a while it's useful to know exactly what kind of error caused a
> transaction to be cancelled.
> Enable xfs_trans_cancel() to receive an error code to be reported.

Stylistically I think I'd rather have an explicit @error and some macros
to avoid the va_args machinery.


void __xfs_trans_cancel(struct xfs_trans *tp, int error) {...}

#define xfs_trans_cancel(tp) __xfs_trans_cancel(tp, 0)
#define xfs_trans_cancel_with(tp, error) __xfs_trans_cancel(tp, error)

--D

> Signed-off-by: Carlos Maiolino <cmaiolino@redhat.com>
> Signed-off-by: Carlos Maiolino <cem@kernel.org>
> ---
>  fs/xfs/xfs_trans.c | 12 +++++++++---
>  fs/xfs/xfs_trans.h |  8 +++++++-
>  2 files changed, 16 insertions(+), 4 deletions(-)
> 
> diff --git a/fs/xfs/xfs_trans.c b/fs/xfs/xfs_trans.c
> index c6657072361a..f6004590565b 100644
> --- a/fs/xfs/xfs_trans.c
> +++ b/fs/xfs/xfs_trans.c
> @@ -971,12 +971,18 @@ xfs_trans_commit(
>   * xfs_trans_commit().
>   */
>  void
> -xfs_trans_cancel(
> -	struct xfs_trans	*tp)
> +_xfs_trans_cancel(
> +	struct xfs_trans	*tp, ...)
>  {
>  	struct xfs_mount	*mp = tp->t_mountp;
>  	struct xlog		*log = mp->m_log;
>  	bool			dirty = (tp->t_flags & XFS_TRANS_DIRTY);
> +	int			error = 0;
> +	va_list			args;
> +
> +	va_start(args, tp);
> +	error = va_arg(args, int);
> +	va_end(args);
>  
>  	trace_xfs_trans_cancel(tp, _RET_IP_);
>  
> @@ -999,7 +1005,7 @@ xfs_trans_cancel(
>  	 * here.
>  	 */
>  	if (dirty && !xfs_is_shutdown(mp)) {
> -		XFS_ERROR_REPORT("xfs_trans_cancel", XFS_ERRLEVEL_LOW, mp);
> +		XFS_ERROR_REPORT("xfs_trans_cancel", XFS_ERRLEVEL_LOW, error, mp);
>  		xfs_force_shutdown(mp, SHUTDOWN_CORRUPT_INCORE);
>  	}
>  #ifdef DEBUG
> diff --git a/fs/xfs/xfs_trans.h b/fs/xfs/xfs_trans.h
> index 2b366851e9a4..05cc7464eb3b 100644
> --- a/fs/xfs/xfs_trans.h
> +++ b/fs/xfs/xfs_trans.h
> @@ -213,6 +213,13 @@ xfs_trans_read_buf(
>  				      flags, bpp, ops);
>  }
>  
> +void _xfs_trans_cancel(xfs_trans_t *, ...);
> +
> +#define xfs_trans_cancel(tp, ...)		\
> +({						\
> +	_xfs_trans_cancel(tp, ##__VA_ARGS__);	\
> +})
> +
>  struct xfs_buf	*xfs_trans_getsb(struct xfs_trans *);
>  struct xfs_buf	*xfs_trans_getrtsb(struct xfs_trans *tp);
>  
> @@ -237,7 +244,6 @@ void		xfs_trans_log_inode(xfs_trans_t *, struct xfs_inode *, uint);
>  int		xfs_trans_commit(struct xfs_trans *);
>  int		xfs_trans_roll(struct xfs_trans **);
>  int		xfs_trans_roll_inode(struct xfs_trans **, struct xfs_inode *);
> -void		xfs_trans_cancel(xfs_trans_t *);
>  int		xfs_trans_ail_init(struct xfs_mount *);
>  void		xfs_trans_ail_destroy(struct xfs_mount *);
>  
> -- 
> 2.55.0
> 
>