Source-Changes-HG archive

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

[src/trunk]: src/sys/miscfs/deadfs do minimal locking to make assertions like...



details:   https://anonhg.NetBSD.org/src/rev/4be20f3fc512
branches:  trunk
changeset: 759835:4be20f3fc512
user:      yamt <yamt%NetBSD.org@localhost>
date:      Fri Dec 17 22:03:00 2010 +0000

description:
do minimal locking to make assertions like KASSERT(VOP_ISLOCKED(vp)) happy.

diffstat:

 sys/miscfs/deadfs/dead_vnops.c |  13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diffs (44 lines):

diff -r b6c5046ab7ba -r 4be20f3fc512 sys/miscfs/deadfs/dead_vnops.c
--- a/sys/miscfs/deadfs/dead_vnops.c    Fri Dec 17 22:00:43 2010 +0000
+++ b/sys/miscfs/deadfs/dead_vnops.c    Fri Dec 17 22:03:00 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dead_vnops.c,v 1.49 2010/07/02 07:58:09 hannken Exp $  */
+/*     $NetBSD: dead_vnops.c,v 1.50 2010/12/17 22:03:00 yamt Exp $     */
 
 /*
  * Copyright (c) 1989, 1993
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dead_vnops.c,v 1.49 2010/07/02 07:58:09 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dead_vnops.c,v 1.50 2010/12/17 22:03:00 yamt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -60,11 +60,11 @@
 #define dead_inactive  genfs_nullop
 #define dead_reclaim   genfs_nullop
 int    dead_lock(void *);
-#define dead_unlock    genfs_nullop
+#define dead_unlock    genfs_unlock
 int    dead_bmap(void *);
 int    dead_strategy(void *);
 int    dead_print(void *);
-#define dead_islocked  genfs_nullop
+#define dead_islocked  genfs_islocked
 #define dead_bwrite    genfs_nullop
 #define dead_revoke    genfs_nullop
 int    dead_getpages(void *);
@@ -235,8 +235,9 @@
                struct proc *a_p;
        } */ *ap = v;
 
-       if (!chkvnlock(ap->a_vp))
-               return (0);
+       if (!chkvnlock(ap->a_vp)) {
+               return genfs_lock(v);
+       }
        return (VCALL(ap->a_vp, VOFFSET(vop_lock), ap));
 }
 



Home | Main Index | Thread Index | Old Index