[src/trunk]: src/sys/kern .. except we need to check the flag while still cli...

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/610742493c8e
branches:  trunk
changeset: 755206:610742493c8e
user:      pooka <pooka%NetBSD.org@localhost>
date:      Thu May 27 23:58:38 2010 +0000

description:
.. except we need to check the flag while still clinging to iLock.

diffstat:

 sys/kern/vfs_subr.c |  10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diffs (38 lines):

diff -r ebe468cd83dc -r 610742493c8e sys/kern/vfs_subr.c
--- a/sys/kern/vfs_subr.c       Thu May 27 23:54:35 2010 +0000
+++ b/sys/kern/vfs_subr.c       Thu May 27 23:58:38 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vfs_subr.c,v 1.402 2010/05/27 23:54:35 pooka Exp $     */
+/*     $NetBSD: vfs_subr.c,v 1.403 2010/05/27 23:58:38 pooka Exp $     */
 
 /*-
  * Copyright (c) 1997, 1998, 2004, 2005, 2007, 2008 The NetBSD Foundation, Inc.
@@ -91,7 +91,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_subr.c,v 1.402 2010/05/27 23:54:35 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_subr.c,v 1.403 2010/05/27 23:58:38 pooka Exp $");
 
 #include "opt_ddb.h"
 #include "opt_compat_netbsd.h"
@@ -1335,6 +1335,11 @@
                        return ENOENT;
                }
        }
+
+       /*
+        * Ok, we got it in good shape.  Just locking left.
+        */
+       KASSERT((vp->v_iflag & VI_CLEAN) == 0);
        if (flags & LK_TYPE_MASK) {
                error = vn_lock(vp, flags | LK_INTERLOCK);
                if (error != 0) {
@@ -1343,7 +1348,6 @@
        } else {
                mutex_exit(&vp->v_interlock);
        }
-       KASSERT(error || (vp->v_iflag & VI_CLEAN) == 0);
        return error;
 }