6334 Cannot unlink files when over quota

*** 1732,1746 ****
  
          /* charge as an update -- would be nice not to charge at all */
          dmu_tx_hold_zap(tx, zfsvfs->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).
           */
-         if (may_delete_now)
                  dmu_tx_mark_netfree(tx);
  
          error = dmu_tx_assign(tx, waited ? TXG_WAITED : TXG_NOWAIT);
          if (error) {
                  zfs_dirent_unlock(dl);
--- 1732,1743 ----
  
          /* charge as an update -- would be nice not to charge at all */
          dmu_tx_hold_zap(tx, zfsvfs->z_unlinkedobj, FALSE, NULL);
  
          /*
!          * Mark this transaction as typically resulting in a net free of space
           */
          dmu_tx_mark_netfree(tx);
  
          error = dmu_tx_assign(tx, waited ? TXG_WAITED : TXG_NOWAIT);
          if (error) {
                  zfs_dirent_unlock(dl);