xfs: Check for -ENOATTR or -EEXIST

Source kernel commit: deed9512872d094ad1eae4abd0ff1c674df251d5

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@oracle.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Acked-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/libxfs/xfs_attr.c b/libxfs/xfs_attr.c
index 5267ee72e8eaa8b7b8289bcf4f731efdfd3b66c3..3d71c275aa2e0badc44a73b08871681b578899a0 100644 (file)
--- a/libxfs/xfs_attr.c
+++ b/libxfs/xfs_attr.c
@@ -404,6 +404,15 @@ 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;
+
                error = xfs_attr_set_args(args);
                if (error)
                        goto out_trans_cancel;
@@ -411,6 +420,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;