summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorTed Unangst <tedu@cvs.openbsd.org>2003-05-11 01:47:01 +0000
committerTed Unangst <tedu@cvs.openbsd.org>2003-05-11 01:47:01 +0000
commitdbbb8cc6608d8ab10a6d1ccf7264aaf0ca6fb9c9 (patch)
treee004a7d0eb0484d78589ea02b57fb967513b03e5 /sys
parent1c38484b8e156f2364a22375a9ecfe1ba7528e7c (diff)
use LK_EXCLUSIVE like all other file systems.
use LK_RETRY in kernfs_root(). "just in case" stuff.
Diffstat (limited to 'sys')
-rw-r--r--sys/miscfs/kernfs/kernfs_vfsops.c4
-rw-r--r--sys/miscfs/kernfs/kernfs_vnops.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/miscfs/kernfs/kernfs_vfsops.c b/sys/miscfs/kernfs/kernfs_vfsops.c
index 5d25f33e911..7d69bbe535f 100644
--- a/sys/miscfs/kernfs/kernfs_vfsops.c
+++ b/sys/miscfs/kernfs/kernfs_vfsops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kernfs_vfsops.c,v 1.21 2003/01/31 20:41:29 art Exp $ */
+/* $OpenBSD: kernfs_vfsops.c,v 1.22 2003/05/11 01:47:00 tedu Exp $ */
/* $NetBSD: kernfs_vfsops.c,v 1.26 1996/04/22 01:42:27 christos Exp $ */
/*
@@ -179,7 +179,7 @@ kernfs_root(mp, vpp)
error = kernfs_allocvp(kt, mp, vpp);
if (error)
return (error);
- vn_lock(*vpp, LK_EXCLUSIVE, curproc);
+ vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY, curproc);
return (0);
}
diff --git a/sys/miscfs/kernfs/kernfs_vnops.c b/sys/miscfs/kernfs/kernfs_vnops.c
index be1af6e7242..7aca9796eb8 100644
--- a/sys/miscfs/kernfs/kernfs_vnops.c
+++ b/sys/miscfs/kernfs/kernfs_vnops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kernfs_vnops.c,v 1.31 2003/04/07 23:37:05 tedu Exp $ */
+/* $OpenBSD: kernfs_vnops.c,v 1.32 2003/05/11 01:47:00 tedu Exp $ */
/* $NetBSD: kernfs_vnops.c,v 1.43 1996/03/16 23:52:47 christos Exp $ */
/*
@@ -542,7 +542,7 @@ kernfs_lookup(v)
return(error);
}
- vn_lock(*vpp, LK_SHARED | LK_RETRY, p);
+ vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY, p);
if (wantpunlock) {
VOP_UNLOCK(dvp, 0, p);