diff options
| author | Darrick J. Wong <djwong@kernel.org> | 2022-05-22 15:59:48 +1000 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2022-05-22 15:59:48 +1000 |
| commit | 3768f6985700106e90eca87d814dc08e609a9969 (patch) | |
| tree | f95741231c8900022a186532881b3662e1b08a34 | |
| parent | 4136e38af728eddcab2e51aecde28e94d0782b9b (diff) | |
| download | linux-3768f6985700106e90eca87d814dc08e609a9969.tar.bz2 | |
xfs: clean up state variable usage in xfs_attr_node_remove_attr
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>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Allison Henderson <allison.henderson@oracle.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
| -rw-r--r-- | fs/xfs/libxfs/xfs_attr.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c index a711976e4faf..130eed8f5185 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; |