summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael I. Bushnell <mib@gnu.org>1993-12-03 02:41:17 +0000
committerMichael I. Bushnell <mib@gnu.org>1993-12-03 02:41:17 +0000
commit160bdc0555d34a6f2792d6cc63f48503a54923d4 (patch)
tree95f5e695903bf774683528e2f4a438adc6a6c202
parent1b90d7ddd9b0875923dc59ee13e3c0f1c985fcbb (diff)
Formerly get_conch.c.~2~
-rw-r--r--libiohelp/get_conch.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libiohelp/get_conch.c b/libiohelp/get_conch.c
index 4e2467b6..779ec2c2 100644
--- a/libiohelp/get_conch.c
+++ b/libiohelp/get_conch.c
@@ -18,10 +18,11 @@
#include <libioserver.h>
/* The conch must be locked when calling this routine. */
+/* Remove any current holder of the conch. */
error_t
_libioserver_internal_get_conch (struct conch *c)
{
- struct shared *user_sh;
+ struct shared_io *user_sh;
int error = 0;
again:
@@ -37,7 +38,7 @@ _libioserver_internal_get_conch (struct conch *c)
/* fall through ... */
case USER_RELEASE_CONCH:
spin_unlock (&user_sh->lock);
- condition_wait (&c->wait, &c->lock);
+ condition_wait (&c->wait, c->lock);
/* Anything can have happened */
goto again;