From c092bddfe739d71f8d9223e35ddf4e3c8c8bf954 Mon Sep 17 00:00:00 2001 From: Tino Reichardt Date: Thu, 1 Aug 2024 22:04:08 +0200 Subject: [PATCH] Fix sa.c to build on FreeBSD again. (#16403) Fix multiple build errors on FreeBSD. The main reason is, that the variable 'dxattr_obj' is used uninitialized within the start of the 'out label'. Signed-off-by: Tino Reichardt Reviewed-by: Tony Hutter Reviewed-by: Alexander Motin --- module/zfs/sa.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/zfs/sa.c b/module/zfs/sa.c index 676fc10a40..bc4c9dff31 100644 --- a/module/zfs/sa.c +++ b/module/zfs/sa.c @@ -1578,6 +1578,8 @@ sa_add_projid(sa_handle_t *hdl, dmu_tx_t *tx, uint64_t projid) uint64_t crtime[2], mtime[2], ctime[2], atime[2]; zfs_acl_phys_t znode_acl = { 0 }; char scanstamp[AV_SCANSTAMP_SZ]; + char *dxattr_obj = NULL; + int dxattr_size = 0; if (zp->z_acl_cached == NULL) { zfs_acl_t *aclp; @@ -1659,8 +1661,6 @@ sa_add_projid(sa_handle_t *hdl, dmu_tx_t *tx, uint64_t projid) if (err != 0 && err != ENOENT) goto out; - char *dxattr_obj = NULL; - int dxattr_size = 0; err = sa_size_locked(hdl, SA_ZPL_DXATTR(zfsvfs), &dxattr_size); if (err != 0 && err != ENOENT) goto out;