diff options
| author | mav <mav@FreeBSD.org> | 2016-03-20 23:54:05 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2016-03-20 23:54:05 +0000 |
| commit | 04fd939370d04dc1f99c8b2bf7d7d46da88cbc5d (patch) | |
| tree | 8e5ec0b1e7df738055a39854e2fe2d0a1d72e720 /sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c | |
| parent | 6ddeef851ff9a3674e070809e1517a2579668aa6 (diff) | |
| download | FreeBSD-src-04fd939370d04dc1f99c8b2bf7d7d46da88cbc5d.zip FreeBSD-src-04fd939370d04dc1f99c8b2bf7d7d46da88cbc5d.tar.gz | |
MFC r294803: 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
Diffstat (limited to 'sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c')
| -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 a7b2562..7091927f 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) { |
