Commit 378b6aef authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Chandan Babu R

xfs: turn the XFS_DA_OP_REPLACE checks in xfs_attr_shortform_addname into asserts

Since commit deed9512 ("xfs: Check for -ENOATTR or -EEXIST"), the
high-level attr code does a lookup for any attr we're trying to set,
and does the checks to handle the create vs replace cases, which thus
never hit the low-level attr code.

Turn the checks in xfs_attr_shortform_addname as they must never trip.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatar"Darrick J. Wong" <djwong@kernel.org>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Signed-off-by: default avatarChandan Babu R <chandanbabu@kernel.org>
parent 074aea4b
...@@ -1072,8 +1072,7 @@ xfs_attr_shortform_addname( ...@@ -1072,8 +1072,7 @@ xfs_attr_shortform_addname(
if (xfs_attr_sf_findname(args)) { if (xfs_attr_sf_findname(args)) {
int error; int error;
if (!(args->op_flags & XFS_DA_OP_REPLACE)) ASSERT(args->op_flags & XFS_DA_OP_REPLACE);
return -EEXIST;
error = xfs_attr_sf_removename(args); error = xfs_attr_sf_removename(args);
if (error) if (error)
...@@ -1087,8 +1086,7 @@ xfs_attr_shortform_addname( ...@@ -1087,8 +1086,7 @@ xfs_attr_shortform_addname(
*/ */
args->op_flags &= ~XFS_DA_OP_REPLACE; args->op_flags &= ~XFS_DA_OP_REPLACE;
} else { } else {
if (args->op_flags & XFS_DA_OP_REPLACE) ASSERT(!(args->op_flags & XFS_DA_OP_REPLACE));
return -ENOATTR;
} }
if (args->namelen >= XFS_ATTR_SF_ENTSIZE_MAX || if (args->namelen >= XFS_ATTR_SF_ENTSIZE_MAX ||
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment