Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
snajpa committed Dec 4, 2024
1 parent b59c086 commit d4c3b4a
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions module/os/freebsd/zfs/zfs_vnops_os.c
Original file line number Diff line number Diff line change
Expand Up @@ -5573,14 +5573,15 @@ zfs_deleteextattr(struct vop_deleteextattr_args *ap)
}
rw_enter(&zp->z_xattr_lock, RW_WRITER);

error = zfs_deleteextattr_impl(ap, zfs_xattr_compat);
error = zfs_deleteextattr_impl(ap, zfs_xattr_compat, maybe_renamed);
if ((error == ENOENT || error == ENOATTR) &&
ap->a_attrnamespace == EXTATTR_NAMESPACE_USER) {
/*
* Fall back to the alternate namespace format if we failed to
* find a user xattr.
*/
error = zfs_deleteextattr_impl(ap, !zfs_xattr_compat);
error = zfs_deleteextattr_impl(ap, !zfs_xattr_compat,
maybe_renamed);
}

rw_exit(&zp->z_xattr_lock);
Expand Down Expand Up @@ -5729,7 +5730,7 @@ zfs_setextattr_impl(struct vop_setextattr_args *ap, boolean_t compat,
/*
* Also clear all versions of the alternate compat name.
*/
zfs_deleteextattr_impl(&vda, !compat);
zfs_deleteextattr_impl(&vda, !compat, maybe_renamed);
}
return (error);
}
Expand Down

0 comments on commit d4c3b4a

Please sign in to comment.