Re: [PATCH 3/8] xfs: remove redundant stat checks after xfs_inobt_insert_rec()

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

On Fri, Oct 16, 2026 at 02:29:03PM -0500, Eric Sandeen wrote:
> xfs_inobt_insert_rec() simply returns the error and status from
> xfs_btree_insert, which has already validated the insert or returned
> an error.
> 
> This makes every instance of the 2nd test in this idiom:
> 
>         if ((error = xfs_inobt_insert_rec(cnt_cur, &i)))
>                 return error;
>         if (XFS_IS_CORRUPT(mp, i != 1)) {
>                 xfs_btree_mark_sick(cnt_cur);
>                 return -EFSCORRUPTED;
>         }
> 
> unnecessary/unreachable code. Remove them.
> 
> Signed-off-by: Eric Sandeen <sandeen@redhat.com>

Looks good!
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>

--D

> ---
>  fs/xfs/libxfs/xfs_ialloc.c | 15 ---------------
>  1 file changed, 15 deletions(-)
> 
> diff --git a/fs/xfs/libxfs/xfs_ialloc.c b/fs/xfs/libxfs/xfs_ialloc.c
> index bb6e684f5467..fd916a2a005b 100644
> --- a/fs/xfs/libxfs/xfs_ialloc.c
> +++ b/fs/xfs/libxfs/xfs_ialloc.c
> @@ -236,7 +236,6 @@ xfs_inobt_insert(
>  			xfs_btree_del_cursor(cur, XFS_BTREE_ERROR);
>  			return error;
>  		}
> -		ASSERT(i == 1);
>  	}
>  
>  	xfs_btree_del_cursor(cur, XFS_BTREE_NOERROR);
> @@ -572,12 +571,6 @@ xfs_inobt_insert_sprec(
>  					     nrec->ir_free, &i);
>  		if (error)
>  			goto error;
> -		if (XFS_IS_CORRUPT(mp, i != 1)) {
> -			xfs_btree_mark_sick(cur);
> -			error = -EFSCORRUPTED;
> -			goto error;
> -		}
> -
>  		goto out;
>  	}
>  
> @@ -647,7 +640,6 @@ xfs_finobt_insert_sprec(
>  	struct xfs_buf			*agbp,
>  	struct xfs_inobt_rec_incore	*nrec)	/* in/out: new rec. */
>  {
> -	struct xfs_mount		*mp = pag_mount(pag);
>  	struct xfs_btree_cur		*cur;
>  	int				error;
>  	int				i;
> @@ -665,11 +657,6 @@ xfs_finobt_insert_sprec(
>  					     nrec->ir_free, &i);
>  		if (error)
>  			goto error;
> -		if (XFS_IS_CORRUPT(mp, i != 1)) {
> -			xfs_btree_mark_sick(cur);
> -			error = -EFSCORRUPTED;
> -			goto error;
> -		}
>  	} else {
>  		error = xfs_inobt_update(cur, nrec);
>  		if (error)
> @@ -2254,8 +2241,6 @@ xfs_difree_finobt(
>  					     ibtrec->ir_free, &i);
>  		if (error)
>  			goto error;
> -		ASSERT(i == 1);
> -
>  		goto out;
>  	}
>  
> -- 
> 2.55.0
> 
>