svn commit: r275544 - vendor-sys/illumos/dist/uts/common/fs/zfs

[Xin LI]

Author: delphij
Date: Sat Dec  6 00:33:09 2014
New Revision: 275544
URL: https://svnweb.freebsd.org/changeset/base/275544

Log:
  5350 clean up code in dnode_sync()
  Reviewed by: Alex Reece <alex.reece at delphix.com>
  Reviewed by: Christopher Siden <christopher.siden at delphix.com>
  Reviewed by: George Wilson <george.wilson at delphix.com>
  Reviewed by: Richard Elling <richard.elling at richardelling.com>
  Approved by: Dan McDonald <danmcd at omniti.com>
  Author: Matthew Ahrens <mahrens at delphix.com>
  
  illumos/illumos-gate at e6518318428d2be1962bf2d47fd83ebfe8cb2736

Modified:
  vendor-sys/illumos/dist/uts/common/fs/zfs/dnode_sync.c

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dnode_sync.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/dnode_sync.c	Sat Dec  6 00:31:58 2014	(r275543)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/dnode_sync.c	Sat Dec  6 00:33:09 2014	(r275544)
@@ -633,12 +633,11 @@ dnode_sync(dnode_t *dn, dmu_tx_t *tx)
 	    dn->dn_free_txg <= tx->tx_txg;
 
 	/*
-	 * We will either remove a spill block when a file is being removed
-	 * or we have been asked to remove it.
+	 * Remove the spill block if we have been explicitly asked to
+	 * remove it, or if the object is being removed.
 	 */
-	if (dn->dn_rm_spillblk[txgoff] ||
-	    ((dnp->dn_flags & DNODE_FLAG_SPILL_BLKPTR) && freeing_dnode)) {
-		if ((dnp->dn_flags & DNODE_FLAG_SPILL_BLKPTR))
+	if (dn->dn_rm_spillblk[txgoff] || freeing_dnode) {
+		if (dnp->dn_flags & DNODE_FLAG_SPILL_BLKPTR)
 			kill_spill = B_TRUE;
 		dn->dn_rm_spillblk[txgoff] = 0;
 	}