diff options
| author | avg <avg@FreeBSD.org> | 2016-08-15 08:53:30 +0000 |
|---|---|---|
| committer | avg <avg@FreeBSD.org> | 2016-08-15 08:53:30 +0000 |
| commit | 5243a4edb4b1061746e70763e1ca5c70bbd77d10 (patch) | |
| tree | 330c5539aadacd27062276cd93568e7f0912ad88 /sys/cddl/contrib | |
| parent | 426c6a4a859c1fa81206fd40f930ebc7016b1988 (diff) | |
| download | FreeBSD-src-5243a4edb4b1061746e70763e1ca5c70bbd77d10.zip FreeBSD-src-5243a4edb4b1061746e70763e1ca5c70bbd77d10.tar.gz | |
MFC r302839: 6940 Cannot unlink directories when over quota
Diffstat (limited to 'sys/cddl/contrib')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c index b0f11ac..17179f6 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c @@ -2438,6 +2438,7 @@ top: dmu_tx_hold_zap(tx, zfsvfs->z_unlinkedobj, FALSE, NULL); zfs_sa_upgrade_txholds(tx, zp); zfs_sa_upgrade_txholds(tx, dzp); + dmu_tx_mark_netfree(tx); error = dmu_tx_assign(tx, waited ? TXG_WAITED : TXG_NOWAIT); if (error) { rw_exit(&zp->z_parent_lock); |
