| Message ID | 20190809213726.32336-11-allison.henderson@oracle.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Delayed Attributes | expand |
On Fri, Aug 09, 2019 at 02:37:18PM -0700, Allison Collins wrote: > New delayed allocation routines cannot be handling > transactions so factor them up into the calling functions > > Signed-off-by: Allison Collins <allison.henderson@oracle.com> Looks ok, Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> --D > --- > 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 6bd87e6..7648ceb 100644 > --- a/fs/xfs/libxfs/xfs_attr.c > +++ b/fs/xfs/libxfs/xfs_attr.c > @@ -1239,6 +1239,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 8a6f5df..4a22ced 100644 > --- a/fs/xfs/libxfs/xfs_attr_leaf.c > +++ b/fs/xfs/libxfs/xfs_attr_leaf.c > @@ -2773,10 +2773,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 error; > } > > /* > -- > 2.7.4 >
On 8/12/19 9:14 AM, Darrick J. Wong wrote: > On Fri, Aug 09, 2019 at 02:37:18PM -0700, Allison Collins wrote: >> New delayed allocation routines cannot be handling >> transactions so factor them up into the calling functions >> >> Signed-off-by: Allison Collins <allison.henderson@oracle.com> > > Looks ok, > Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> Great! Thanks! Allison > > --D > >> --- >> 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 6bd87e6..7648ceb 100644 >> --- a/fs/xfs/libxfs/xfs_attr.c >> +++ b/fs/xfs/libxfs/xfs_attr.c >> @@ -1239,6 +1239,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 8a6f5df..4a22ced 100644 >> --- a/fs/xfs/libxfs/xfs_attr_leaf.c >> +++ b/fs/xfs/libxfs/xfs_attr_leaf.c >> @@ -2773,10 +2773,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 error; >> } >> >> /* >> -- >> 2.7.4 >>
diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c index 6bd87e6..7648ceb 100644 --- a/fs/xfs/libxfs/xfs_attr.c +++ b/fs/xfs/libxfs/xfs_attr.c @@ -1239,6 +1239,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 8a6f5df..4a22ced 100644 --- a/fs/xfs/libxfs/xfs_attr_leaf.c +++ b/fs/xfs/libxfs/xfs_attr_leaf.c @@ -2773,10 +2773,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 error; } /*
New delayed allocation routines cannot be handling transactions so factor them up into the calling functions Signed-off-by: Allison Collins <allison.henderson@oracle.com> --- fs/xfs/libxfs/xfs_attr.c | 5 +++++ fs/xfs/libxfs/xfs_attr_leaf.c | 5 +---- 2 files changed, 6 insertions(+), 4 deletions(-)