summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/kern/kern_umtx.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/sys/kern/kern_umtx.c b/sys/kern/kern_umtx.c
index dd205d0..f871d41 100644
--- a/sys/kern/kern_umtx.c
+++ b/sys/kern/kern_umtx.c
@@ -2965,9 +2965,12 @@ sleep:
suword32(&rwlock->rw_blocked_readers, blocked_readers-1);
if (blocked_readers == 1) {
rv = fueword32(&rwlock->rw_state, &state);
- if (rv == -1)
+ if (rv == -1) {
+ umtxq_unbusy_unlocked(&uq->uq_key);
error = EFAULT;
- while (error == 0) {
+ break;
+ }
+ for (;;) {
rv = casueword32(&rwlock->rw_state, state,
&oldstate, state & ~URWLOCK_READ_WAITERS);
if (rv == -1) {
@@ -2978,6 +2981,8 @@ sleep:
break;
state = oldstate;
error = umtxq_check_susp(td);
+ if (error != 0)
+ break;
}
}
OpenPOWER on IntegriCloud