On Sunday, February 23, 2020 7:36 AM Allison Collins wrote: > New delayed allocation routines cannot be handling transactions so factor them up > into the calling functions > I don't see any logical errors. Reviewed-by: Chandan Rajendra <chandanrlinux@xxxxxxxxx> > Signed-off-by: Allison Collins <allison.henderson@xxxxxxxxxx> > Reviewed-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx> > Reviewed-by: Brian Foster <bfoster@xxxxxxxxxx> > --- > fs/xfs/libxfs/xfs_attr.c | 5 +++++ > fs/xfs/libxfs/xfs_attr_leaf.c | 5 +---- > 2 files changed, 6 insertions(+), 4 deletions(-) > > diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c > index 71298b9..26412da 100644 > --- a/fs/xfs/libxfs/xfs_attr.c > +++ b/fs/xfs/libxfs/xfs_attr.c > @@ -1244,6 +1244,11 @@ xfs_attr_node_removename( > error = xfs_attr3_leaf_setflag(args); > if (error) > goto out; > + > + error = xfs_trans_roll_inode(&args->trans, args->dp); > + if (error) > + goto out; > + > error = xfs_attr_rmtval_remove(args); > if (error) > goto out; > diff --git a/fs/xfs/libxfs/xfs_attr_leaf.c b/fs/xfs/libxfs/xfs_attr_leaf.c > index d691509..67339f0 100644 > --- a/fs/xfs/libxfs/xfs_attr_leaf.c > +++ b/fs/xfs/libxfs/xfs_attr_leaf.c > @@ -2855,10 +2855,7 @@ xfs_attr3_leaf_setflag( > XFS_DA_LOGRANGE(leaf, name_rmt, sizeof(*name_rmt))); > } > > - /* > - * Commit the flag value change and start the next trans in series. > - */ > - return xfs_trans_roll_inode(&args->trans, args->dp); > + return 0; > } > > /* > -- chandan
