Skip to content

Commit

Permalink
xfs: Add helper function xfs_attr_node_removename_rmt
Browse files Browse the repository at this point in the history
This patch adds another new helper function
xfs_attr_node_removename_rmt. This will also help modularize
xfs_attr_node_removename when we add delay ready attributes later.

Signed-off-by: Allison Collins <allison.henderson@oracle.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Chandan Rajendra <chandanrlinux@gmail.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Acked-by: Dave Chinner <dchinner@redhat.com>
  • Loading branch information
Allison Collins authored and Darrick J. Wong committed Jul 29, 2020
1 parent 674eb54 commit 72b97ea
Showing 1 changed file with 19 additions and 9 deletions.
28 changes: 19 additions & 9 deletions fs/xfs/libxfs/xfs_attr.c
Original file line number Diff line number Diff line change
@@ -1198,6 +1198,24 @@ int xfs_attr_node_removename_setup(
return 0;
}

STATIC int
xfs_attr_node_remove_rmt(
struct xfs_da_args *args,
struct xfs_da_state *state)
{
int error = 0;

error = xfs_attr_rmtval_remove(args);
if (error)
return error;

/*
* Refill the state structure with buffers, the prior calls released our
* buffers.
*/
return xfs_attr_refillstate(state);
}

/*
* Remove a name from a B-tree attribute list.
*
@@ -1226,15 +1244,7 @@ xfs_attr_node_removename(
* overflow the maximum size of a transaction and/or hit a deadlock.
*/
if (args->rmtblkno > 0) {
error = xfs_attr_rmtval_remove(args);
if (error)
goto out;

/*
* Refill the state structure with buffers, the prior calls
* released our buffers.
*/
error = xfs_attr_refillstate(state);
error = xfs_attr_node_remove_rmt(args, state);
if (error)
goto out;
}

0 comments on commit 72b97ea

Please sign in to comment.