Source-Changes-HG archive

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

[src/trunk]: src/sys/fs/union Return correct value from union_islocked.



details:   https://anonhg.NetBSD.org/src/rev/e69f63df3afb
branches:  trunk
changeset: 754466:e69f63df3afb
user:      pooka <pooka%NetBSD.org@localhost>
date:      Sat May 01 10:44:59 2010 +0000

description:
Return correct value from union_islocked.
(XXX: anything asserting LK_SHARED will fail because union doesn't
support shared locks)

diffstat:

 sys/fs/union/union_vnops.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r fec4a209aaed -r e69f63df3afb sys/fs/union/union_vnops.c
--- a/sys/fs/union/union_vnops.c        Sat May 01 10:43:31 2010 +0000
+++ b/sys/fs/union/union_vnops.c        Sat May 01 10:44:59 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: union_vnops.c,v 1.34 2010/01/08 11:35:09 pooka Exp $   */
+/*     $NetBSD: union_vnops.c,v 1.35 2010/05/01 10:44:59 pooka Exp $   */
 
 /*
  * Copyright (c) 1992, 1993, 1994, 1995
@@ -72,7 +72,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: union_vnops.c,v 1.34 2010/01/08 11:35:09 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: union_vnops.c,v 1.35 2010/05/01 10:44:59 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1795,7 +1795,7 @@
                struct vnode *a_vp;
        } */ *ap = v;
 
-       return ((VTOUNION(ap->a_vp)->un_flags & UN_LOCKED) ? 1 : 0);
+       return ((VTOUNION(ap->a_vp)->un_flags & UN_LOCKED) ? LK_EXCLUSIVE : 0);
 }
 
 int



Home | Main Index | Thread Index | Old Index