From: Allison Collins <allison.henderson@oracle.com>
To: linux-xfs@vger.kernel.org
Subject: [PATCH v8 02/20] xfs: Check for -ENOATTR or -EEXIST
Date: Fri, 3 Apr 2020 15:12:11 -0700 [thread overview]
Message-ID: <20200403221229.4995-3-allison.henderson@oracle.com> (raw)
In-Reply-To: <20200403221229.4995-1-allison.henderson@oracle.com>
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>
---
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;
+
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
next prev parent reply other threads:[~2020-04-03 22:14 UTC|newest]
Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-03 22:12 [PATCH v8 00/20] xfs: Delay Ready Attributes Allison Collins
2020-04-03 22:12 ` [PATCH v8 01/20] xfs: Add xfs_has_attr and subroutines Allison Collins
2020-04-06 14:31 ` Brian Foster
2020-04-06 22:09 ` Allison Collins
2020-04-03 22:12 ` Allison Collins [this message]
2020-04-06 14:31 ` [PATCH v8 02/20] xfs: Check for -ENOATTR or -EEXIST Brian Foster
2020-04-06 23:14 ` Allison Collins
2020-04-15 6:43 ` Chandan Rajendra
2020-04-03 22:12 ` [PATCH v8 03/20] xfs: Factor out new helper functions xfs_attr_rmtval_set Allison Collins
2020-04-03 22:12 ` [PATCH v8 04/20] xfs: Pull up trans handling in xfs_attr3_leaf_flipflags Allison Collins
2020-04-03 22:12 ` [PATCH v8 05/20] xfs: Split apart xfs_attr_leaf_addname Allison Collins
2020-04-03 22:12 ` [PATCH v8 06/20] xfs: Refactor xfs_attr_try_sf_addname Allison Collins
2020-04-03 22:12 ` [PATCH v8 07/20] xfs: Pull up trans roll from xfs_attr3_leaf_setflag Allison Collins
2020-04-03 22:12 ` [PATCH v8 08/20] xfs: Factor out xfs_attr_rmtval_invalidate Allison Collins
2020-04-03 22:12 ` [PATCH v8 09/20] xfs: Pull up trans roll in xfs_attr3_leaf_clearflag Allison Collins
2020-04-03 22:12 ` [PATCH v8 10/20] xfs: Add helper function __xfs_attr_rmtval_remove Allison Collins
2020-04-07 14:16 ` Brian Foster
2020-04-07 22:19 ` Allison Collins
2020-04-29 23:05 ` Darrick J. Wong
2020-04-29 23:09 ` Darrick J. Wong
2020-04-03 22:12 ` [PATCH v8 11/20] xfs: Add helper function xfs_attr_node_shrink Allison Collins
2020-04-07 14:17 ` Brian Foster
2020-04-07 21:52 ` Allison Collins
2020-04-15 10:16 ` Chandan Rajendra
2020-04-15 22:13 ` Allison Collins
2020-04-03 22:12 ` [PATCH v8 12/20] xfs: Removed unneeded xfs_trans_roll_inode calls Allison Collins
2020-04-07 14:17 ` Brian Foster
2020-04-07 21:53 ` Allison Collins
2020-04-03 22:12 ` [PATCH v8 13/20] xfs: Add helpers xfs_attr_is_shortform and xfs_attr_set_shortform Allison Collins
2020-04-07 15:23 ` Brian Foster
2020-04-07 21:53 ` Allison Collins
2020-04-10 16:55 ` Allison Collins
2020-04-11 12:57 ` Brian Foster
2020-04-20 5:30 ` Chandan Rajendra
2020-04-20 22:45 ` Allison Collins
2020-04-03 22:12 ` [PATCH v8 14/20] xfs: Add helper function xfs_attr_leaf_mark_incomplete Allison Collins
2020-04-07 15:23 ` Brian Foster
2020-04-07 21:53 ` Allison Collins
2020-04-03 22:12 ` [PATCH v8 15/20] xfs: Add remote block helper functions Allison Collins
2020-04-08 12:09 ` Brian Foster
2020-04-08 16:32 ` Allison Collins
2020-04-03 22:12 ` [PATCH v8 16/20] xfs: Add helper function xfs_attr_node_removename_setup Allison Collins
2020-04-08 12:09 ` Brian Foster
2020-04-08 16:32 ` Allison Collins
2020-04-20 6:25 ` Chandan Rajendra
2020-04-20 22:46 ` Allison Collins
2020-04-03 22:12 ` [PATCH v8 17/20] xfs: Add helper function xfs_attr_node_removename_rmt Allison Collins
2020-04-08 12:10 ` Brian Foster
2020-04-08 16:32 ` Allison Collins
2020-04-20 6:38 ` Chandan Rajendra
2020-04-20 22:46 ` Allison Collins
2020-04-03 22:12 ` [PATCH v8 18/20] xfs: Add delay ready attr remove routines Allison Collins
2020-04-13 12:30 ` Brian Foster
2020-04-14 21:35 ` Allison Collins
2020-04-15 11:46 ` Brian Foster
2020-04-16 3:17 ` Allison Collins
2020-04-16 10:58 ` Brian Foster
2020-04-16 22:41 ` Allison Collins
2020-04-20 9:06 ` Chandan Rajendra
2020-04-20 23:26 ` Allison Collins
2020-04-03 22:12 ` [PATCH v8 19/20] xfs: Add delay ready attr set routines Allison Collins
2020-04-13 13:40 ` Brian Foster
2020-04-15 22:08 ` Allison Collins
2020-04-16 11:01 ` Brian Foster
2020-04-16 22:54 ` Allison Collins
2020-04-17 10:36 ` Brian Foster
2020-04-20 11:45 ` Chandan Rajendra
2020-04-20 16:20 ` Brian Foster
2020-04-20 23:26 ` Allison Collins
2020-04-03 22:12 ` [PATCH v8 20/20] xfs: Rename __xfs_attr_rmtval_remove Allison Collins
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200403221229.4995-3-allison.henderson@oracle.com \
--to=allison.henderson@oracle.com \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).