Author: mav
Date: Tue Jan 26 12:47:33 2016
New Revision: 294802
URL: https://svnweb.freebsd.org/changeset/base/294802

Log:
  6334 Cannot unlink files when over quota
  
  Reviewed by: Matthew Ahrens <[email protected]>
  Reviewed by: Toomas Soome <[email protected]>
  Approved by: Dan McDonald <[email protected]>
  Author: Simon Klinkert <[email protected]>
  
  illumos/illumos-gate@6575bca01367958c7237253d88e5fa9ef0b1650a

Modified:
  vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_vnops.c

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_vnops.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_vnops.c       Tue Jan 26 
12:44:49 2016        (r294801)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_vnops.c       Tue Jan 26 
12:47:33 2016        (r294802)
@@ -1734,12 +1734,9 @@ top:
        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).
+        * 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) {
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"

Reply via email to