Commit 0949d317 authored by Allison Collins's avatar Allison Collins Committed by Darrick J. Wong

xfs: Pull up trans roll from xfs_attr3_leaf_setflag

New delayed allocation routines cannot be handling transactions so
pull them up into the calling functions
Signed-off-by: default avatarAllison Collins <allison.henderson@oracle.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarChandan Rajendra <chandanrlinux@gmail.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Acked-by: default avatarDave Chinner <dchinner@redhat.com>
parent 6cc5b5f8
...@@ -1126,6 +1126,11 @@ xfs_attr_node_removename( ...@@ -1126,6 +1126,11 @@ xfs_attr_node_removename(
error = xfs_attr3_leaf_setflag(args); error = xfs_attr3_leaf_setflag(args);
if (error) if (error)
goto out; goto out;
error = xfs_trans_roll_inode(&args->trans, args->dp);
if (error)
goto out;
error = xfs_attr_rmtval_remove(args); error = xfs_attr_rmtval_remove(args);
if (error) if (error)
goto out; goto out;
......
...@@ -2833,10 +2833,7 @@ xfs_attr3_leaf_setflag( ...@@ -2833,10 +2833,7 @@ xfs_attr3_leaf_setflag(
XFS_DA_LOGRANGE(leaf, name_rmt, sizeof(*name_rmt))); XFS_DA_LOGRANGE(leaf, name_rmt, sizeof(*name_rmt)));
} }
/* return 0;
* Commit the flag value change and start the next trans in series.
*/
return xfs_trans_roll_inode(&args->trans, args->dp);
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment