Commit 1fc618d7 authored by Allison Collins's avatar Allison Collins Committed by Darrick J. Wong

xfs: Pull up trans roll in xfs_attr3_leaf_clearflag

New delayed allocation routines cannot be handling transactions so
pull them out into the calling functions
Signed-off-by: default avatarAllison Collins <allison.henderson@oracle.com>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.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 79514109
...@@ -709,6 +709,14 @@ xfs_attr_leaf_addname( ...@@ -709,6 +709,14 @@ xfs_attr_leaf_addname(
* Added a "remote" value, just clear the incomplete flag. * Added a "remote" value, just clear the incomplete flag.
*/ */
error = xfs_attr3_leaf_clearflag(args); error = xfs_attr3_leaf_clearflag(args);
if (error)
return error;
/*
* Commit the flag value change and start the next trans in
* series.
*/
error = xfs_trans_roll_inode(&args->trans, args->dp);
} }
return error; return error;
} }
...@@ -1067,6 +1075,14 @@ xfs_attr_node_addname( ...@@ -1067,6 +1075,14 @@ xfs_attr_node_addname(
error = xfs_attr3_leaf_clearflag(args); error = xfs_attr3_leaf_clearflag(args);
if (error) if (error)
goto out; goto out;
/*
* Commit the flag value change and start the next trans in
* series.
*/
error = xfs_trans_roll_inode(&args->trans, args->dp);
if (error)
goto out;
} }
retval = error = 0; retval = error = 0;
......
...@@ -2782,10 +2782,7 @@ xfs_attr3_leaf_clearflag( ...@@ -2782,10 +2782,7 @@ xfs_attr3_leaf_clearflag(
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