| 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 /usr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c freebsd-11.1/usr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c |
| --- /usr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c 2017-07-21 07:42:01.000000000 +0800 |
| +++ freebsd-11.1/usr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c 2019-03-22 16:37:49.445142000 +0800 |
| @@ -1171,6 +1171,7 @@ |
| sa_bulk_attr_t bulk[5]; |
| uint64_t ctime[2]; |
| int count = 0; |
| + zfs_acl_phys_t acl_phys; |
| |
| mode = zp->z_mode; |
| |
| @@ -1217,7 +1218,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), |