llumos 6334 - Cannot unlink files when over quota

6334 Cannot unlink files when over quota
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: Toomas Soome <tsoome@me.com>
Approved by: Dan McDonald <danmcd@omniti.com>

References:
  https://www.illumos.org/issues/6334
  https://github.com/illumos/illumos-gate/commit/6575bca

Ported-by: Brian Behlendorf <behlendorf1@llnl.gov>

diff --git a/module/zfs/zfs_vnops.c b/module/zfs/zfs_vnops.c
index f386b98a7417e778108cfd4220a3afb3296d5958..21b5d1ca4e43c1217f34de8081bfd6623823e84d 100644 (file)
--- a/module/zfs/zfs_vnops.c
+++ b/module/zfs/zfs_vnops.c
@@ -1628,12 +1628,9 @@ top:
        dmu_tx_hold_zap(tx, zsb->z_unlinkedobj, FALSE, NULL);
 
        /*
-        * Mark this transaction as typically resulting in a net free of
-        * space, unless object removal will be delayed indefinitely
-        * (due to active holds on the vnode due to the file being open).
+        * Mark this transaction as typically resulting in a net free of space
         */
-       if (may_delete_now)
-               dmu_tx_mark_netfree(tx);
+       dmu_tx_mark_netfree(tx);
 
        error = dmu_tx_assign(tx, waited ? TXG_WAITED : TXG_NOWAIT);
        if (error) {