Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

FreeBSD: Don't remove SA xattr if not SA znode 

We attempt to remove an existing SA xattr when setting a dir xattr, but
this only makes sense if the znode has been upgraded to the SA format.
Otherwise, we will hit an assert in zfs_sa_get_xattr.

Make sure this is an SA znode before attempting to remove the SA xattr.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Signed-off-by: Ryan Moeller <ryan@iXsystems.com>
Closes #12514
This commit is contained in:
Ryan Moeller 2021-08-30 19:01:09 -04:00 committed by GitHub
parent b1a1c64313
commit 3b89d9518d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
module/os/freebsd/zfs/zfs_vnops_os.c
View File

@ -5695,7 +5695,7 @@ zfs_setextattr(struct vop_setextattr_args *ap)
} }
if (error) { if (error) {
error = zfs_setextattr_dir(ap, attrname); error = zfs_setextattr_dir(ap, attrname);
if (error == 0) if (error == 0 && zp->z_is_sa)
/* /*
* Successfully put into dir, we need to clear the one * Successfully put into dir, we need to clear the one
* in SA if present. * in SA if present.