diff options
| author | Simon Klinkert <simon.klinkert@gmail.com> | 2016-05-25 09:51:53 +0200 |
|---|---|---|
| committer | Robert Mustacchi <rm@joyent.com> | 2016-06-05 10:58:33 -0700 |
| commit | 99189164df06057fb968ca7be701bb1a0d5da8c9 (patch) | |
| tree | dad8178d1ccf8c57bf9a4d83eb86293b31fda271 /usr/src | |
| parent | 002ec3e4c3efa65890ba89d290fe2cc209838c12 (diff) | |
| download | illumos-joyent-99189164df06057fb968ca7be701bb1a0d5da8c9.tar.gz | |
6940 Cannot unlink directories when over quota
Reviewed by: Dan McDonald <danmcd@omniti.com>
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Approved by: Robert Mustacchi <rm@joyent.com>
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/uts/common/fs/zfs/zfs_vnops.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/usr/src/uts/common/fs/zfs/zfs_vnops.c b/usr/src/uts/common/fs/zfs/zfs_vnops.c index 0ac0bd8814..9cba49b402 100644 --- a/usr/src/uts/common/fs/zfs/zfs_vnops.c +++ b/usr/src/uts/common/fs/zfs/zfs_vnops.c @@ -2113,6 +2113,7 @@ top: dmu_tx_hold_zap(tx, zfsvfs->z_unlinkedobj, FALSE, NULL); zfs_sa_upgrade_txholds(tx, zp); zfs_sa_upgrade_txholds(tx, dzp); + dmu_tx_mark_netfree(tx); error = dmu_tx_assign(tx, waited ? TXG_WAITED : TXG_NOWAIT); if (error) { rw_exit(&zp->z_parent_lock); |