Module Name: src
Committed By: pooka
Date: Sat May 1 10:44:59 UTC 2010
Modified Files:
src/sys/fs/union: union_vnops.c
Log Message:
Return correct value from union_islocked.
(XXX: anything asserting LK_SHARED will fail because union doesn't
support shared locks)
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/fs/union/union_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/fs/union/union_vnops.c
diff -u src/sys/fs/union/union_vnops.c:1.34 src/sys/fs/union/union_vnops.c:1.35
--- src/sys/fs/union/union_vnops.c:1.34 Fri Jan 8 11:35:09 2010
+++ src/sys/fs/union/union_vnops.c Sat May 1 10:44:59 2010
@@ -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
