d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFV r275544:

Browse Source 
Clean up some duplicated code in dnode_sync() around freeing spill blocks.

Illumos issue:
    5350 clean up code in dnode_sync()

MFC after:	2 weeks
This commit is contained in:
delphij 2014-12-13 01:18:23 +00:00
parent 917c282900
commit b6fe3b0b2d
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c
View File

@ -633,12 +633,11 @@ dnode_sync(dnode_t *dn, dmu_tx_t *tx)
dn->dn_free_txg <= tx->tx_txg; dn->dn_free_txg <= tx->tx_txg;
/* /*
* We will either remove a spill block when a file is being removed * Remove the spill block if we have been explicitly asked to
* or we have been asked to remove it. * remove it, or if the object is being removed.
*/ */
if (dn->dn_rm_spillblk[txgoff] || if (dn->dn_rm_spillblk[txgoff] || freeing_dnode) {
((dnp->dn_flags & DNODE_FLAG_SPILL_BLKPTR) && freeing_dnode)) { if (dnp->dn_flags & DNODE_FLAG_SPILL_BLKPTR)
if ((dnp->dn_flags & DNODE_FLAG_SPILL_BLKPTR))
kill_spill = B_TRUE; kill_spill = B_TRUE;
dn->dn_rm_spillblk[txgoff] = 0; dn->dn_rm_spillblk[txgoff] = 0;
} }