mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +00:00
xfs: Reverse apply 72b97ea40d
Originally we added this patch to help modularize the attr code in preparation for delayed attributes and the state machine it requires. However, later reviews found that this slightly alters the transaction handling as the helper function is ambiguous as to whether the transaction is diry or clean. This may cause a dirty transaction to be included in the next roll, where previously it had not. To preserve the existing code flow, we reverse apply this commit. Signed-off-by: Allison Henderson <allison.henderson@oracle.com> Reviewed-by: Brian Foster <bfoster@redhat.com> Reviewed-by: Chandan Babu R <chandanrlinux@gmail.com> Reviewed-by: Darrick J. Wong <djwong@kernel.org>
This commit is contained in:
parent
0fe0bbe00a
commit
4126c06e25
1 changed files with 9 additions and 19 deletions
|
@ -1214,24 +1214,6 @@ 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.
|
||||
*
|
||||
|
@ -1260,7 +1242,15 @@ xfs_attr_node_removename(
|
|||
* overflow the maximum size of a transaction and/or hit a deadlock.
|
||||
*/
|
||||
if (args->rmtblkno > 0) {
|
||||
error = xfs_attr_node_remove_rmt(args, state);
|
||||
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);
|
||||
if (error)
|
||||
goto out;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue