diff options
author | Pawel Jakub Dawidek <pjd@FreeBSD.org> | 2011-03-23 11:09:04 +0000 |
---|---|---|
committer | Pawel Jakub Dawidek <pjd@FreeBSD.org> | 2011-03-23 11:09:04 +0000 |
commit | 640b7ee6237f79a97ad717359c490b7d1781bfb9 (patch) | |
tree | 3f4c900acd993d66c5159287125c2b5e294980aa /sbin/hastd/secondary.c | |
parent | 9775d5ebdf9aad0c1930f762ca1b154095049756 (diff) | |
download | src-640b7ee6237f79a97ad717359c490b7d1781bfb9.tar.gz src-640b7ee6237f79a97ad717359c490b7d1781bfb9.zip |
Don't create socketpair for connection forwarding between parent and secondary.
Secondary doesn't need to connect anywhere.
MFC after: 1 week
Notes
Notes:
svn path=/head/; revision=219900
Diffstat (limited to 'sbin/hastd/secondary.c')
-rw-r--r-- | sbin/hastd/secondary.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/sbin/hastd/secondary.c b/sbin/hastd/secondary.c index 39aa40458865..714588facd80 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); |