Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/coda move the assert after the locked case.



details:   https://anonhg.NetBSD.org/src/rev/a30cbc9c27e7
branches:  trunk
changeset: 779107:a30cbc9c27e7
user:      christos <christos%NetBSD.org@localhost>
date:      Thu May 03 14:26:42 2012 +0000

description:
move the assert after the locked case.

diffstat:

 sys/coda/coda_vnops.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 7611f99987fd -r a30cbc9c27e7 sys/coda/coda_vnops.c
--- a/sys/coda/coda_vnops.c     Wed May 02 23:33:11 2012 +0000
+++ b/sys/coda/coda_vnops.c     Thu May 03 14:26:42 2012 +0000
@@ -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 @@
        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 @@
                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);



Home | Main Index | Thread Index | Old Index