From: Matthew Dillon <dillon@apollo.backplane.com>
Date: Thu, 25 Oct 2012 18:09:16 +0000 (-0700)
Subject: hammer2 - Messaging layer separation work part 4
X-Git-Tag: v3.4.0rc~978
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/8a9471c3d410b5ec1e1414d67e1214b6e0ee9862

hammer2 - Messaging layer separation work part 4

* Cleanup, bug fixes, operations tests successful now.
---

diff --git a/sbin/mount_hammer2/mount_hammer2.c b/sbin/mount_hammer2/mount_hammer2.c
index bf2ece2fba..9f26be6083 100644
--- a/sbin/mount_hammer2/mount_hammer2.c
+++ b/sbin/mount_hammer2/mount_hammer2.c
@@ -42,6 +42,7 @@
 #include <stdlib.h>
 #include <strings.h>
 #include <unistd.h>
+#include <dmsg.h>
 
 static int cluster_connect(const char *volume);
 
@@ -136,7 +137,7 @@ cluster_connect(const char *volume __unused)
 	bzero(&lsin, sizeof(lsin));
 	lsin.sin_family = AF_INET;
 	lsin.sin_addr.s_addr = 0;
-	lsin.sin_port = htons(HAMMER2_LISTEN_PORT);
+	lsin.sin_port = htons(DMSG_LISTEN_PORT);
 
 	if (connect(fd, (struct sockaddr *)&lsin, sizeof(lsin)) < 0) {
 		close(fd);
diff --git a/sys/kern/kern_dmsg.c b/sys/kern/kern_dmsg.c
index d65ee1029a..0bf8723077 100644
--- a/sys/kern/kern_dmsg.c
+++ b/sys/kern/kern_dmsg.c
@@ -857,6 +857,7 @@ kdmsg_state_msgtx(kdmsg_msg_t *msg)
 	if ((state = iocom->freewr_state) == NULL) {
 		state = kmalloc(sizeof(*state), iocom->mmsg, M_WAITOK | M_ZERO);
 		state->flags = KDMSG_STATE_DYNAMIC;
+		state->router = &iocom->router;
 		iocom->freewr_state = state;
 	}