Skip to content

Commit 1a04bab

Browse files
sklinkertbehlendorf
authored andcommitted
llumos 6334 - Cannot unlink files when over quota
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> References: https://www.illumos.org/issues/6334 illumos/illumos-gate@6575bca Ported-by: Brian Behlendorf <behlendorf1@llnl.gov>
1 parent a966c56 commit 1a04bab

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

module/zfs/zfs_vnops.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1628,12 +1628,9 @@ zfs_remove(struct inode *dip, char *name, cred_t *cr)
16281628
dmu_tx_hold_zap(tx, zsb->z_unlinkedobj, FALSE, NULL);
16291629

16301630
/*
1631-
* Mark this transaction as typically resulting in a net free of
1632-
* space, unless object removal will be delayed indefinitely
1633-
* (due to active holds on the vnode due to the file being open).
1631+
* Mark this transaction as typically resulting in a net free of space
16341632
*/
1635-
if (may_delete_now)
1636-
dmu_tx_mark_netfree(tx);
1633+
dmu_tx_mark_netfree(tx);
16371634

16381635
error = dmu_tx_assign(tx, waited ? TXG_WAITED : TXG_NOWAIT);
16391636
if (error) {

0 commit comments

Comments
 (0)