diff options
| author | Simon Klinkert <simon.klinkert@gmail.com> | 2015-10-14 11:08:25 +0200 |
|---|---|---|
| committer | Dan McDonald <danmcd@omniti.com> | 2015-10-30 07:48:18 -0400 |
| commit | 6575bca01367958c7237253d88e5fa9ef0b1650a (patch) | |
| tree | 5948907bebb413302c108eb75342646b073eb296 /usr/src | |
| parent | 56b82ca86b4cef01d1cd3a61ead0ec2cca5a1047 (diff) | |
| download | illumos-joyent-6575bca01367958c7237253d88e5fa9ef0b1650a.tar.gz | |
6334 Cannot unlink files when over quota
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: Toomas Soome <tsoome@me.com>
Approved by: Dan McDonald <danmcd@omniti.com>
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/uts/common/fs/zfs/zfs_vnops.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/usr/src/uts/common/fs/zfs/zfs_vnops.c b/usr/src/uts/common/fs/zfs/zfs_vnops.c index 49b1587640..8f461c521f 100644 --- a/usr/src/uts/common/fs/zfs/zfs_vnops.c +++ b/usr/src/uts/common/fs/zfs/zfs_vnops.c @@ -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) { |