| @@ -5826,30 +5826,30 @@ zfs_netbsd_reclaim(void *v) | | | @@ -5826,30 +5826,30 @@ zfs_netbsd_reclaim(void *v) |
5826 | dmu_tx_t *tx = dmu_tx_create(zfsvfs->z_os); | | 5826 | dmu_tx_t *tx = dmu_tx_create(zfsvfs->z_os); |
5827 | | | 5827 | |
5828 | dmu_tx_hold_sa(tx, zp->z_sa_hdl, B_FALSE); | | 5828 | dmu_tx_hold_sa(tx, zp->z_sa_hdl, B_FALSE); |
5829 | zfs_sa_upgrade_txholds(tx, zp); | | 5829 | zfs_sa_upgrade_txholds(tx, zp); |
5830 | error = dmu_tx_assign(tx, TXG_WAIT); | | 5830 | error = dmu_tx_assign(tx, TXG_WAIT); |
5831 | if (error) { | | 5831 | if (error) { |
5832 | dmu_tx_abort(tx); | | 5832 | dmu_tx_abort(tx); |
5833 | } else { | | 5833 | } else { |
5834 | (void) sa_update(zp->z_sa_hdl, SA_ZPL_ATIME(zfsvfs), | | 5834 | (void) sa_update(zp->z_sa_hdl, SA_ZPL_ATIME(zfsvfs), |
5835 | (void *)&zp->z_atime, sizeof (zp->z_atime), tx); | | 5835 | (void *)&zp->z_atime, sizeof (zp->z_atime), tx); |
5836 | zp->z_atime_dirty = 0; | | 5836 | zp->z_atime_dirty = 0; |
5837 | dmu_tx_commit(tx); | | 5837 | dmu_tx_commit(tx); |
5838 | } | | 5838 | } |
5839 | } | | | |
5840 | | | 5839 | |
5841 | if (zfsvfs->z_log) | | 5840 | if (zfsvfs->z_os->os_sync == ZFS_SYNC_ALWAYS) |
5842 | zil_commit(zfsvfs->z_log, zp->z_id); | | 5841 | zil_commit(zfsvfs->z_log, zp->z_id); |
| | | 5842 | } |
5843 | | | 5843 | |
5844 | if (zp->z_sa_hdl == NULL) | | 5844 | if (zp->z_sa_hdl == NULL) |
5845 | zfs_znode_free(zp); | | 5845 | zfs_znode_free(zp); |
5846 | else | | 5846 | else |
5847 | zfs_zinactive(zp); | | 5847 | zfs_zinactive(zp); |
5848 | rw_exit(&zfsvfs->z_teardown_inactive_lock); | | 5848 | rw_exit(&zfsvfs->z_teardown_inactive_lock); |
5849 | return 0; | | 5849 | return 0; |
5850 | } | | 5850 | } |
5851 | | | 5851 | |
5852 | static int | | 5852 | static int |
5853 | zfs_netbsd_fid(void *v) | | 5853 | zfs_netbsd_fid(void *v) |
5854 | { | | 5854 | { |
5855 | struct vop_fid_args *ap = v; | | 5855 | struct vop_fid_args *ap = v; |