| Fix use of acl_phys after recycled. |
| Reported in bug 225162. |
| Fixed in r329711, r330232, r330235. |
| |
| diff -ru --exclude-from freebsd-src-diff-exclude-names /var/archive3/public/freebsd-releng-10.4-src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c freebsd-10.4/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c |
| --- /var/archive3/public/freebsd-releng-10.4-src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c 2017-09-29 08:19:56.000000000 +0800 |
| +++ freebsd-10.4/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c 2019-08-17 23:42:09.418303224 +0800 |
| @@ -1174,6 +1174,7 @@ |
| sa_bulk_attr_t bulk[5]; |
| uint64_t ctime[2]; |
| int count = 0; |
| + zfs_acl_phys_t acl_phys; |
| |
| mode = zp->z_mode; |
| |
| @@ -1220,7 +1221,6 @@ |
| } else { /* Painful legacy way */ |
| zfs_acl_node_t *aclnode; |
| uint64_t off = 0; |
| - zfs_acl_phys_t acl_phys; |
| uint64_t aoid; |
| |
| if ((error = sa_lookup(zp->z_sa_hdl, SA_ZPL_ZNODE_ACL(zfsvfs), |