Re: [PATCH v7 06/19] xfs: Factor out trans handling in xfs_attr3_leaf_flipflags

Amir Goldstein
2020-02-23T12:30:18Z

On Sun, Feb 23, 2020 at 4:07 AM Allison Collins
<allison.henderson@oracle.com> wrote:
>
> Since delayed operations cannot roll transactions, factor up the transaction
> handling into the calling function

I am not a native English speaker, so not sure what the correct phrase is,
but I'm pretty sure its not factor up, nor factor out???

>
> Signed-off-by: Allison Collins <allison.henderson@oracle.com>
> Reviewed-by: Brian Foster <bfoster@redhat.com>
> Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---
> fs/xfs/libxfs/xfs_attr.c | 14 ++++++++++++++
> fs/xfs/libxfs/xfs_attr_leaf.c | 7 +------
> 2 files changed, 15 insertions(+), 6 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
> index a2f812f..cf0cba7 100644
> --- a/fs/xfs/libxfs/xfs_attr.c
> +++ b/fs/xfs/libxfs/xfs_attr.c
> @@ -739,6 +739,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
> @@ -1081,6 +1088,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 9d6b68c..d691509 100644
> --- a/fs/xfs/libxfs/xfs_attr_leaf.c
> +++ b/fs/xfs/libxfs/xfs_attr_leaf.c
> @@ -2973,10 +2973,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;
> + return 0;
> }
> --
> 2.7.4
>