From: Matthew Dillon <dillon@apollo.backplane.com>
Date: Thu, 9 Aug 2012 20:05:58 +0000 (-0700)
Subject: hammer2 - Fix nact assertion
X-Git-Tag: v3.4.0rc~1030
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/1bd13960225becf46baed27b98415b8146b58611?ds=sidebyside

hammer2 - Fix nact assertion

* An nact assertion was getting hit because of an assumption that
  the assertion caused not to be correct.  Fix the assumption.
---

diff --git a/sbin/hammer2/msg.c b/sbin/hammer2/msg.c
index 8ca483dc88..a47d811666 100644
--- a/sbin/hammer2/msg.c
+++ b/sbin/hammer2/msg.c
@@ -1235,14 +1235,14 @@ hammer2_iocom_flush2(hammer2_iocom_t *iocom)
 
 		if ((size_t)nact < hbytes - ioq->hbytes) {
 			ioq->hbytes += nact;
-			/* nact = 0; */
+			nact = 0;
 			break;
 		}
 		nact -= hbytes - ioq->hbytes;
 		ioq->hbytes = hbytes;
 		if ((size_t)nact < abytes - ioq->abytes) {
 			ioq->abytes += nact;
-			/* nact = 0; */
+			nact = 0;
 			break;
 		}
 		nact -= abytes - ioq->abytes;