Module Name: src
Committed By: hannken
Date: Fri Jul 2 07:56:46 UTC 2010
Modified Files:
src/sys/fs/union: union_vnops.c
Log Message:
LK_INTERLOCK is no longer a valid flag for VOP_LOCK().
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 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.37 src/sys/fs/union/union_vnops.c:1.38
--- src/sys/fs/union/union_vnops.c:1.37 Thu Jul 1 13:00:56 2010
+++ src/sys/fs/union/union_vnops.c Fri Jul 2 07:56:46 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: union_vnops.c,v 1.37 2010/07/01 13:00:56 hannken Exp $ */
+/* $NetBSD: union_vnops.c,v 1.38 2010/07/02 07:56:46 hannken Exp $ */
/*
* Copyright (c) 1992, 1993, 1994, 1995
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: union_vnops.c,v 1.37 2010/07/01 13:00:56 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: union_vnops.c,v 1.38 2010/07/02 07:56:46 hannken Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1630,7 +1630,6 @@
flags = (flags & ~LK_SHARED) | LK_EXCLUSIVE;
}
- genfs_nolock(ap);
/*
* Need to do real lockmgr-style locking here.
* in the mean time, draining won't work quite right,
@@ -1640,7 +1639,6 @@
if ((flags & LK_TYPE_MASK) == LK_DRAIN)
return (0);
*/
- flags &= ~LK_INTERLOCK;
un = VTOUNION(vp);
start:
@@ -1734,7 +1732,6 @@
#ifdef DIAGNOSTIC
un->un_pid = 0;
#endif
- genfs_nounlock(ap);
return (0);
}
