On Thu, Sep 05, 2019 at 03:18:24PM -0700, Allison Collins wrote: > Since delayed operations cannot roll transactions, factor > up the transaction handling into the calling function > > Signed-off-by: Allison Collins <allison.henderson@xxxxxxxxxx> > --- Reviewed-by: Brian Foster <bfoster@xxxxxxxxxx> > fs/xfs/libxfs/xfs_attr.c | 14 ++++++++++++++ > fs/xfs/libxfs/xfs_attr_leaf.c | 5 ----- > 2 files changed, 14 insertions(+), 5 deletions(-) > > diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c > index a297857..7a6dd37 100644 > --- a/fs/xfs/libxfs/xfs_attr.c > +++ b/fs/xfs/libxfs/xfs_attr.c > @@ -710,6 +710,13 @@ xfs_attr_leaf_addname( > error = xfs_attr3_leaf_flipflags(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); > + if (error) > + return error; > > /* > * Dismantle the "old" attribute/value pair by removing > @@ -1046,6 +1053,13 @@ xfs_attr_node_addname( > error = xfs_attr3_leaf_flipflags(args); > if (error) > 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; > > /* > * Dismantle the "old" attribute/value pair by removing > diff --git a/fs/xfs/libxfs/xfs_attr_leaf.c b/fs/xfs/libxfs/xfs_attr_leaf.c > index a501538..3903e5c 100644 > --- a/fs/xfs/libxfs/xfs_attr_leaf.c > +++ b/fs/xfs/libxfs/xfs_attr_leaf.c > @@ -2919,10 +2919,5 @@ xfs_attr3_leaf_flipflags( > XFS_DA_LOGRANGE(leaf2, name_rmt, sizeof(*name_rmt))); > } > > - /* > - * Commit the flag value change and start the next trans in series. > - */ > - error = xfs_trans_roll_inode(&args->trans, args->dp); > - > return error; > } > -- > 2.7.4 >
