diff options
| author | Simon Klinkert <[email protected]> | 2016-01-22 16:00:59 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2016-01-26 15:27:08 -0800 |
| commit | 1a04bab34808694f3bf1cef3dc208c9499d103aa (patch) | |
| tree | 5d77fb8d045bacd604a3c9babe55bb420ffa0a78 | |
| parent | a966c5640e432f723753e63354394406a7c3dcf8 (diff) | |
llumos 6334 - Cannot unlink files when over quota
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]>
References:
https://www.illumos.org/issues/6334
https://github.com/illumos/illumos-gate/commit/6575bca
Ported-by: Brian Behlendorf <[email protected]>
| -rw-r--r-- | module/zfs/zfs_vnops.c | 7 |
1 files changed, 2 insertions, 5 deletions
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) { |