Re: [PATCH 7/8] xfs: remove redundant stat checks after xfs_refcount_delete()

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

On Fri, Oct 16, 2026 at 02:29:07PM -0500, Eric Sandeen wrote:
> xfs_refcount_delete() simply returns the error and status from
> xfs_btree_delete, which now validates the delete or returns an error.
> 
> This makes every instance of the 2nd test in this idiom:
> 
> 	error = xfs_refcount_delete(cur, &found_rec);
> 	if (error)
> 		goto out_error;
> 	if (XFS_IS_CORRUPT(cur->bc_mp, found_rec != 1)) {
> 		xfs_btree_mark_sick(cur);
> 		error = -EFSCORRUPTED;
> 		goto out_error;
> 	}
> 
> 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_refcount.c | 30 ------------------------------
>  1 file changed, 30 deletions(-)
> 
> diff --git a/fs/xfs/libxfs/xfs_refcount.c b/fs/xfs/libxfs/xfs_refcount.c
> index bf7526621681..924f839b35a0 100644
> --- a/fs/xfs/libxfs/xfs_refcount.c
> +++ b/fs/xfs/libxfs/xfs_refcount.c
> @@ -500,21 +500,11 @@ xfs_refcount_merge_center_extents(
>  	error = xfs_refcount_delete(cur, &found_rec);
>  	if (error)
>  		goto out_error;
> -	if (XFS_IS_CORRUPT(cur->bc_mp, found_rec != 1)) {
> -		xfs_btree_mark_sick(cur);
> -		error = -EFSCORRUPTED;
> -		goto out_error;
> -	}
>  
>  	if (center->rc_refcount > 1) {
>  		error = xfs_refcount_delete(cur, &found_rec);
>  		if (error)
>  			goto out_error;
> -		if (XFS_IS_CORRUPT(cur->bc_mp, found_rec != 1)) {
> -			xfs_btree_mark_sick(cur);
> -			error = -EFSCORRUPTED;
> -			goto out_error;
> -		}
>  	}
>  
>  	/* Enlarge the left extent. */
> @@ -574,11 +564,6 @@ xfs_refcount_merge_left_extent(
>  		error = xfs_refcount_delete(cur, &found_rec);
>  		if (error)
>  			goto out_error;
> -		if (XFS_IS_CORRUPT(cur->bc_mp, found_rec != 1)) {
> -			xfs_btree_mark_sick(cur);
> -			error = -EFSCORRUPTED;
> -			goto out_error;
> -		}
>  	}
>  
>  	/* Enlarge the left extent. */
> @@ -641,11 +626,6 @@ xfs_refcount_merge_right_extent(
>  		error = xfs_refcount_delete(cur, &found_rec);
>  		if (error)
>  			goto out_error;
> -		if (XFS_IS_CORRUPT(cur->bc_mp, found_rec != 1)) {
> -			xfs_btree_mark_sick(cur);
> -			error = -EFSCORRUPTED;
> -			goto out_error;
> -		}
>  	}
>  
>  	/* Enlarge the right extent. */
> @@ -1232,11 +1212,6 @@ xfs_refcount_adjust_extents(
>  			error = xfs_refcount_delete(cur, &found_rec);
>  			if (error)
>  				goto out_error;
> -			if (XFS_IS_CORRUPT(cur->bc_mp, found_rec != 1)) {
> -				xfs_btree_mark_sick(cur);
> -				error = -EFSCORRUPTED;
> -				goto out_error;
> -			}
>  			goto advloop;
>  		} else {
>  			error = xrefc_free_extent(cur, &ext);
> @@ -1847,11 +1822,6 @@ xfs_refcount_adjust_cow_extents(
>  		error = xfs_refcount_delete(cur, &found_rec);
>  		if (error)
>  			goto out_error;
> -		if (XFS_IS_CORRUPT(cur->bc_mp, found_rec != 1)) {
> -			xfs_btree_mark_sick(cur);
> -			error = -EFSCORRUPTED;
> -			goto out_error;
> -		}
>  		break;
>  	default:
>  		ASSERT(0);
> -- 
> 2.55.0
> 
>