Module Name: src
Committed By: ozaki-r
Date: Wed Sep 30 01:31:56 UTC 2015
Modified Files:
src/sys/rump/librump/rumpkern: locks.c
Log Message:
Remove redundant UNLOCKED and LOCKED
UNLOCKED and LOCKED are done inside mutex_exit and mutex_enter respectively
so we don't need to do them outside mutex_exit and mutex_enter.
Reviewed by pooka@
To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/sys/rump/librump/rumpkern/locks.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpkern/locks.c
diff -u src/sys/rump/librump/rumpkern/locks.c:1.69 src/sys/rump/librump/rumpkern/locks.c:1.70
--- src/sys/rump/librump/rumpkern/locks.c:1.69 Fri Apr 25 18:13:59 2014
+++ src/sys/rump/librump/rumpkern/locks.c Wed Sep 30 01:31:56 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: locks.c,v 1.69 2014/04/25 18:13:59 pooka Exp $ */
+/* $NetBSD: locks.c,v 1.70 2015/09/30 01:31:56 ozaki-r Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: locks.c,v 1.69 2014/04/25 18:13:59 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locks.c,v 1.70 2015/09/30 01:31:56 ozaki-r Exp $");
#include <sys/param.h>
#include <sys/kmem.h>
@@ -368,7 +368,6 @@ docvwait(kcondvar_t *cv, kmutex_t *mtx,
if (__predict_false(l->l_flag & LW_RUMP_QEXIT)) {
struct proc *p = l->l_proc;
- UNLOCKED(mtx, false);
mutex_exit(mtx); /* drop and retake later */
mutex_enter(p->p_lock);
@@ -383,7 +382,6 @@ docvwait(kcondvar_t *cv, kmutex_t *mtx,
/* ok, we can exit and remove "reference" to l->private */
mutex_enter(mtx);
- LOCKED(mtx, false);
rv = EINTR;
}
l->l_private = NULL;
