diff options
| author | avg <avg@FreeBSD.org> | 2016-08-15 08:54:09 +0000 |
|---|---|---|
| committer | avg <avg@FreeBSD.org> | 2016-08-15 08:54:09 +0000 |
| commit | d04ffba506e17b123799abfc5817ae4e3de780b4 (patch) | |
| tree | f3f039cef210eb7dcfea08b6444940036d78dca1 /sys/cddl/contrib | |
| parent | 49c5ce49319eeae6585d84e418137848539d2017 (diff) | |
| download | FreeBSD-src-d04ffba506e17b123799abfc5817ae4e3de780b4.zip FreeBSD-src-d04ffba506e17b123799abfc5817ae4e3de780b4.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 5302a22..4693542 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 @@ -2244,6 +2244,7 @@ zfs_rmdir(vnode_t *dvp, vnode_t *vp, char *name, cred_t *cr) 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, TXG_WAIT); if (error) { dmu_tx_abort(tx); |
