On Fri, Apr 03, 2020 at 03:12:11PM -0700, Allison Collins wrote:
> Delayed operations cannot return error codes. So we must check for
> these conditions first before starting set or remove operations
>
> Signed-off-by: Allison Collins <allison.henderson@xxxxxxxxxx>
> Reviewed-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
> ---
> fs/xfs/libxfs/xfs_attr.c | 15 +++++++++++++++
> 1 file changed, 15 insertions(+)
>
> diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
> index 2a0d3d3..f7e289e 100644
> --- a/fs/xfs/libxfs/xfs_attr.c
> +++ b/fs/xfs/libxfs/xfs_attr.c
> @@ -404,6 +404,17 @@ xfs_attr_set(
> args->total, 0, quota_flags);
> if (error)
> goto out_trans_cancel;
> +
> + error = xfs_has_attr(args);
> + if (error == -EEXIST && (args->attr_flags & XATTR_CREATE))
> + goto out_trans_cancel;
> +
> + if (error == -ENOATTR && (args->attr_flags & XATTR_REPLACE))
> + goto out_trans_cancel;
> +
> + if (error != -ENOATTR && error != -EEXIST)
> + goto out_trans_cancel;
I'd kill off the whitespace between the above error checks. Otherwise
looks good to me:
Reviewed-by: Brian Foster <bfoster@xxxxxxxxxx>
> +
> error = xfs_attr_set_args(args);
> if (error)
> goto out_trans_cancel;
> @@ -411,6 +422,10 @@ xfs_attr_set(
> if (!args->trans)
> goto out_unlock;
> } else {
> + error = xfs_has_attr(args);
> + if (error != -EEXIST)
> + goto out_trans_cancel;
> +
> error = xfs_attr_remove_args(args);
> if (error)
> goto out_trans_cancel;
> --
> 2.7.4
>
