From 99189164df06057fb968ca7be701bb1a0d5da8c9 Mon Sep 17 00:00:00 2001
From: Simon Klinkert <simon.klinkert@gmail.com>
Date: Wed, 25 May 2016 09:51:53 +0200
Subject: [PATCH] 6940 Cannot unlink directories when over quota Reviewed by:
 Dan McDonald <danmcd@omniti.com> Reviewed by: Matthew Ahrens
 <mahrens@delphix.com> Approved by: Robert Mustacchi <rm@joyent.com>

---
 usr/src/uts/common/fs/zfs/zfs_vnops.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/src/uts/common/fs/zfs/zfs_vnops.c b/usr/src/uts/common/fs/zfs/zfs_vnops.c
index 0ac0bd8814ed..9cba49b402a7 100644
--- a/usr/src/uts/common/fs/zfs/zfs_vnops.c
+++ b/usr/src/uts/common/fs/zfs/zfs_vnops.c
@@ -2113,6 +2113,7 @@ zfs_rmdir(vnode_t *dvp, char *name, vnode_t *cwd, 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, waited ? TXG_WAITED : TXG_NOWAIT);
 	if (error) {
 		rw_exit(&zp->z_parent_lock);