On Thu, Apr 30, 2020 at 03:50:13PM -0700, Allison Collins wrote:
> Lift -ENOSPC handler from xfs_attr_leaf_addname. This will help to
> reorganize transitions between the attr forms later.
>
> Signed-off-by: Allison Collins <allison.henderson@xxxxxxxxxx>
> ---
Reviewed-by: Brian Foster <bfoster@xxxxxxxxxx>
> fs/xfs/libxfs/xfs_attr.c | 25 +++++++++++--------------
> 1 file changed, 11 insertions(+), 14 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
> index 9171895..c8cae68 100644
> --- a/fs/xfs/libxfs/xfs_attr.c
> +++ b/fs/xfs/libxfs/xfs_attr.c
> @@ -299,6 +299,13 @@ xfs_attr_set_args(
> return error;
>
> /*
> + * Promote the attribute list to the Btree format.
> + */
> + error = xfs_attr3_leaf_to_node(args);
> + if (error)
> + return error;
> +
> + /*
> * Commit that transaction so that the node_addname()
> * call can manage its own transactions.
> */
> @@ -602,7 +609,7 @@ xfs_attr_leaf_try_add(
> struct xfs_da_args *args,
> struct xfs_buf *bp)
> {
> - int retval, error;
> + int retval;
>
> /*
> * Look up the given attribute in the leaf block. Figure out if
> @@ -634,20 +641,10 @@ xfs_attr_leaf_try_add(
> }
>
> /*
> - * Add the attribute to the leaf block, transitioning to a Btree
> - * if required.
> + * Add the attribute to the leaf block
> */
> - retval = xfs_attr3_leaf_add(bp, args);
> - if (retval == -ENOSPC) {
> - /*
> - * Promote the attribute list to the Btree format. Unless an
> - * error occurs, retain the -ENOSPC retval
> - */
> - error = xfs_attr3_leaf_to_node(args);
> - if (error)
> - return error;
> - }
> - return retval;
> + return xfs_attr3_leaf_add(bp, args);
> +
> out_brelse:
> xfs_trans_brelse(args->trans, bp);
> return retval;
> --
> 2.7.4
>
