wip

vpsfreecz · Dec 4, 2024 · 5e834df · 5e834df
1 parent 87982e5
commit 5e834df
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/module/os/freebsd/zfs/zfs_vnops_os.c b/module/os/freebsd/zfs/zfs_vnops_os.c
@@ -5192,15 +5192,16 @@ zfs_check_attrname(const char *name)
 static char *
 zfs_attrname_maybe_rename(char *name)
 {
-	char *ret;
+	char *ret = name;
 
 	if (zfs_xattr_compat)
-		return (name);
+		return (ret);
 
 	if (ZFS_XA_NS_PREFIX_FORBIDDEN(name)) {
 		ret = kmem_alloc(strlen(name) + 6, KM_SLEEP);
 		snprintf(ret, strlen(name), "user.%s", name);
 	}
+	return (ret);
 }
 
 static void
@@ -5395,7 +5396,8 @@ zfs_getextattr_impl(struct vop_getextattr_args *ap, boolean_t compat,
 static int
 zfs_getextattr(struct vop_getextattr_args *ap)
 {
-	char *origname = (char *)ap->a_name, *maybe_renamed;
+	const char *origname = ap->a_name;
+	char *maybe_renamed;
 	znode_t *zp = VTOZ(ap->a_vp);
 	zfsvfs_t *zfsvfs = ZTOZSB(zp);
 	int error;
@@ -5545,7 +5547,8 @@ zfs_deleteextattr_impl(struct vop_deleteextattr_args *ap, boolean_t compat,
 static int
 zfs_deleteextattr(struct vop_deleteextattr_args *ap)
 {
-	char *origname = (char *)ap->a_name, *maybe_renamed;
+	const char *origname = ap->a_name;
+	char *maybe_renamed;
 	znode_t *zp = VTOZ(ap->a_vp);
 	zfsvfs_t *zfsvfs = ZTOZSB(zp);
 	int error;
@@ -5741,7 +5744,8 @@ zfs_setextattr_impl(struct vop_setextattr_args *ap, boolean_t compat,
 static int
 zfs_setextattr(struct vop_setextattr_args *ap)
 {
-	char *origname = (char *)ap->a_name, *maybe_renamed;
+	const char *origname = ap->a_name;
+	char *maybe_renamed;
 	znode_t *zp = VTOZ(ap->a_vp);
 	zfsvfs_t *zfsvfs = ZTOZSB(zp);
 	int error;