summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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;