summaryrefslogtreecommitdiffstats
path: root/sbin/hastd/secondary.c
diff options
context:
space:
mode:
authorpjd <pjd@FreeBSD.org>2011-03-23 11:09:04 +0000
committerpjd <pjd@FreeBSD.org>2011-03-23 11:09:04 +0000
commit4845f0f34232026617a88683d9d09e53883b6b3d (patch)
tree3f4c900acd993d66c5159287125c2b5e294980aa /sbin/hastd/secondary.c
parent1c16fc718951e391368eea036d13db2c06f8fdc4 (diff)
downloadFreeBSD-src-4845f0f34232026617a88683d9d09e53883b6b3d.zip
FreeBSD-src-4845f0f34232026617a88683d9d09e53883b6b3d.tar.gz
Don't create socketpair for connection forwarding between parent and secondary.
Secondary doesn't need to connect anywhere. MFC after: 1 week
Diffstat (limited to 'sbin/hastd/secondary.c')
-rw-r--r--sbin/hastd/secondary.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/sbin/hastd/secondary.c b/sbin/hastd/secondary.c
index 39aa404..714588f 100644
--- a/sbin/hastd/secondary.c
+++ b/sbin/hastd/secondary.c
@@ -378,16 +378,6 @@ hastd_secondary(struct hast_resource *res, struct nv *nvin)
pjdlog_exit(EX_OSERR,
"Unable to create event sockets between child and parent");
}
- /*
- * Create communication channel for sending connection requests from
- * parent to child.
- */
- if (proto_client(NULL, "socketpair://", &res->hr_conn) < 0) {
- /* TODO: There's no need for this to be fatal error. */
- KEEP_ERRNO((void)pidfile_remove(pfh));
- pjdlog_exit(EX_OSERR,
- "Unable to create connection sockets between parent and child");
- }
pid = fork();
if (pid < 0) {
@@ -405,7 +395,6 @@ hastd_secondary(struct hast_resource *res, struct nv *nvin)
proto_recv(res->hr_event, NULL, 0);
/* Declare that we are sender. */
proto_send(res->hr_ctrl, NULL, 0);
- proto_send(res->hr_conn, NULL, 0);
res->hr_workerpid = pid;
return;
}
@@ -418,7 +407,6 @@ hastd_secondary(struct hast_resource *res, struct nv *nvin)
proto_send(res->hr_event, NULL, 0);
/* Declare that we are receiver. */
proto_recv(res->hr_ctrl, NULL, 0);
- proto_recv(res->hr_conn, NULL, 0);
descriptors_cleanup(res);
descriptors_assert(res, mode);
OpenPOWER on IntegriCloud