Re: [PATCH 6/7] xfs: clean up state variable usage in xfs_attr_node_remove_attr

[Alli <allison.henderson@oracle.com>]

On Wed, 2022-05-18 at 11:56 -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <djwong@kernel.org>
> 
> The state variable is now a local variable pointing to a heap
> allocation, so we don't need to zero-initialize it, nor do we need
> the
> conditional to decide if we should free it.
> 
> Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Looks ok
Reviewed-by: Allison Henderson <allison.henderson@oracle.com>
> ---
>  fs/xfs/libxfs/xfs_attr.c |    7 ++-----
>  1 file changed, 2 insertions(+), 5 deletions(-)
> 
> 
> diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
> index 162fbac78524..b1300bd10318 100644
> --- a/fs/xfs/libxfs/xfs_attr.c
> +++ b/fs/xfs/libxfs/xfs_attr.c
> @@ -1516,7 +1516,7 @@ xfs_attr_node_remove_attr(
>  	struct xfs_attr_item		*attr)
>  {
>  	struct xfs_da_args		*args = attr->xattri_da_args;
> -	struct xfs_da_state		*state = NULL;
> +	struct xfs_da_state		*state =
> xfs_da_state_alloc(args);
>  	int				retval = 0;
>  	int				error = 0;
>  
> @@ -1526,8 +1526,6 @@ xfs_attr_node_remove_attr(
>  	 * attribute entry after any split ops.
>  	 */
>  	args->attr_filter |= XFS_ATTR_INCOMPLETE;
> -	state = xfs_da_state_alloc(args);
> -	state->inleaf = 0;
>  	error = xfs_da3_node_lookup_int(state, &retval);
>  	if (error)
>  		goto out;
> @@ -1545,8 +1543,7 @@ xfs_attr_node_remove_attr(
>  	retval = error = 0;
>  
>  out:
> -	if (state)
> -		xfs_da_state_free(state);
> +	xfs_da_state_free(state);
>  	if (error)
>  		return error;
>  	return retval;
>