Skip to content

Commit 0949d31

Browse files
allisonhendersondjwong
authored andcommitted
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: Allison Collins <[email protected]> Reviewed-by: Darrick J. Wong <[email protected]> Reviewed-by: Brian Foster <[email protected]> Reviewed-by: Chandan Rajendra <[email protected]> Signed-off-by: Darrick J. Wong <[email protected]> Acked-by: Dave Chinner <[email protected]>
1 parent 6cc5b5f commit 0949d31

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

fs/xfs/libxfs/xfs_attr.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1126,6 +1126,11 @@ xfs_attr_node_removename(
11261126
error = xfs_attr3_leaf_setflag(args);
11271127
if (error)
11281128
goto out;
1129+
1130+
error = xfs_trans_roll_inode(&args->trans, args->dp);
1131+
if (error)
1132+
goto out;
1133+
11291134
error = xfs_attr_rmtval_remove(args);
11301135
if (error)
11311136
goto out;

fs/xfs/libxfs/xfs_attr_leaf.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2833,10 +2833,7 @@ xfs_attr3_leaf_setflag(
28332833
XFS_DA_LOGRANGE(leaf, name_rmt, sizeof(*name_rmt)));
28342834
}
28352835

2836-
/*
2837-
* Commit the flag value change and start the next trans in series.
2838-
*/
2839-
return xfs_trans_roll_inode(&args->trans, args->dp);
2836+
return 0;
28402837
}
28412838

28422839
/*

0 commit comments

Comments
 (0)