Author: mav
Date: Sun Mar 20 23:54:05 2016
New Revision: 297096
URL: https://svnweb.freebsd.org/changeset/base/297096
Log:
MFC r294803: MFV r294802: 6334 Cannot unlink files when over quota
Reviewed by: Matthew Ahrens <mahr...@delphix.com>
Reviewed by: Toomas Soome <tso...@me.com>
Approved by: Dan McDonald <dan...@omniti.com>
Author: Simon Klinkert <simon.klink...@gmail.com>
illumos/illumos-gate@6575bca01367958c7237253d88e5fa9ef0b1650a
Modified:
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
Sun Mar 20 23:52:45 2016 (r297095)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
Sun Mar 20 23:54:05 2016 (r297096)
@@ -2009,12 +2009,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) {
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
