From: Simon Klinkert Date: Sat, 23 Jan 2016 00:00:59 +0000 (-0800) Subject: llumos 6334 - Cannot unlink files when over quota X-Git-Tag: zfs-0.7.0-rc1~266 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1a04bab34808694f3bf1cef3dc208c9499d103aa;p=zfs llumos 6334 - Cannot unlink files when over quota 6334 Cannot unlink files when over quota Reviewed by: Matthew Ahrens Reviewed by: Toomas Soome Approved by: Dan McDonald References: https://www.illumos.org/issues/6334 https://github.com/illumos/illumos-gate/commit/6575bca Ported-by: Brian Behlendorf --- diff --git a/module/zfs/zfs_vnops.c b/module/zfs/zfs_vnops.c index f386b98a7..21b5d1ca4 100644 --- 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) {