Module Name: src
Committed By: christos
Date: Thu May 3 14:26:43 UTC 2012
Modified Files:
src/sys/coda: coda_vnops.c
Log Message:
move the assert after the locked case.
To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 src/sys/coda/coda_vnops.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/coda/coda_vnops.c
diff -u src/sys/coda/coda_vnops.c:1.85 src/sys/coda/coda_vnops.c:1.86
--- src/sys/coda/coda_vnops.c:1.85 Wed May 2 12:51:01 2012
+++ src/sys/coda/coda_vnops.c Thu May 3 10:26:42 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: coda_vnops.c,v 1.85 2012/05/02 16:51:01 christos Exp $ */
+/* $NetBSD: coda_vnops.c,v 1.86 2012/05/03 14:26:42 christos Exp $ */
/*
*
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: coda_vnops.c,v 1.85 2012/05/02 16:51:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: coda_vnops.c,v 1.86 2012/05/03 14:26:42 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1953,8 +1953,6 @@ coda_getpages(void *v)
int waslocked; /* 1 if vnode lock was held on entry */
int didopen = 0; /* 1 if we opened container file */
- KASSERT(mutex_owned(vp->v_interlock));
-
/*
* Handle a case that uvm_fault doesn't quite use yet.
* See layer_vnops.c. for inspiration.
@@ -1963,6 +1961,8 @@ coda_getpages(void *v)
return EBUSY;
}
+ KASSERT(mutex_owned(vp->v_interlock));
+
/* Check for control object. */
if (IS_CTL_VP(vp)) {
printf("%s: control object %p\n", __func__, vp);
