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

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 <milky-zfs@mcmilk.de>
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed-by: Alexander Motin <mav@FreeBSD.org>
This commit is contained in:
Tino Reichardt 2024-08-01 22:04:08 +02:00 committed by GitHub
parent d60debbf59
commit c092bddfe7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
module/zfs/sa.c
View File

@ -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]; uint64_t crtime[2], mtime[2], ctime[2], atime[2];
zfs_acl_phys_t znode_acl = { 0 }; zfs_acl_phys_t znode_acl = { 0 };
char scanstamp[AV_SCANSTAMP_SZ]; char scanstamp[AV_SCANSTAMP_SZ];
char *dxattr_obj = NULL;
int dxattr_size = 0;
if (zp->z_acl_cached == NULL) { if (zp->z_acl_cached == NULL) {
zfs_acl_t *aclp; 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) if (err != 0 && err != ENOENT)
goto out; goto out;
char *dxattr_obj = NULL;
int dxattr_size = 0;
err = sa_size_locked(hdl, SA_ZPL_DXATTR(zfsvfs), &dxattr_size); err = sa_size_locked(hdl, SA_ZPL_DXATTR(zfsvfs), &dxattr_size);
if (err != 0 && err != ENOENT) if (err != 0 && err != ENOENT)
goto out; goto out;