[PATCH 62/67] xfs: turn the XFS_DA_OP_REPLACE checks in xfs_attr_shortform_addname into asserts

Darrick J. Wong
2024-03-13T02:09:12Z

From: Christoph Hellwig <hch@lst.de>

Source kernel commit: 378b6aef9de0f7c3d0de309ecc61c11eb29e57da

Since commit deed9512872d ("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: Christoph Hellwig <hch@lst.de>
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Chandan Babu R <chandanbabu@kernel.org>
---
libxfs/xfs_attr.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/libxfs/xfs_attr.c b/libxfs/xfs_attr.c
index 055d204101a5..1419846bdf9d 100644
--- a/libxfs/xfs_attr.c
+++ b/libxfs/xfs_attr.c
@@ -1070,8 +1070,7 @@ xfs_attr_shortform_addname(
if (xfs_attr_sf_findname(args)) {
int error;

- if (!(args->op_flags & XFS_DA_OP_REPLACE))
- return -EEXIST;
+ ASSERT(args->op_flags & XFS_DA_OP_REPLACE);

error = xfs_attr_sf_removename(args);
if (error)
@@ -1085,8 +1084,7 @@ xfs_attr_shortform_addname(
*/
args->op_flags &= ~XFS_DA_OP_REPLACE;
} else {
- if (args->op_flags & XFS_DA_OP_REPLACE)
- return -ENOATTR;
+ ASSERT(!(args->op_flags & XFS_DA_OP_REPLACE));
}

if (args->namelen >= XFS_ATTR_SF_ENTSIZE_MAX ||