diff options
| author | Alexander Motin <mav@FreeBSD.org> | 2016-01-26 12:48:10 +0000 |
|---|---|---|
| committer | Alexander Motin <mav@FreeBSD.org> | 2016-01-26 12:48:10 +0000 |
| commit | 02404a5ad286078a541b8f04ae1a18056eceec8d (patch) | |
| tree | 88ef4322494f874d2e50799452bb3a33f7dabbc9 /sys/cddl | |
| parent | 2360c716f916e3fc1d0ca7c87425b906160b6437 (diff) | |
| parent | 12269e5e635372997f85b49270f1bb50777763de (diff) | |
| download | src-02404a5ad286078a541b8f04ae1a18056eceec8d.tar.gz src-02404a5ad286078a541b8f04ae1a18056eceec8d.zip | |
MFV r294802: 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>
Author: Simon Klinkert <simon.klinkert@gmail.com>
illumos/illumos-gate@6575bca01367958c7237253d88e5fa9ef0b1650a
Notes
Notes:
svn path=/head/; revision=294803
Diffstat (limited to 'sys/cddl')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c index 78f84470497a..9df85a741af1 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c @@ -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) { |