CVS commit: [ad-namecache] src/sys/kern

[Andrew Doran]

Module Name:    src
Committed By:   ad
Date:           Sat Feb 29 22:00:03 UTC 2020

Modified Files:
        src/sys/kern [ad-namecache]: vfs_vnops.c

Log Message:
Back out experimental change - not ready for LK_SHARED on VOP_OPEN() just yet.


To generate a diff of this commit:
cvs rdiff -u -r1.204.2.3 -r1.204.2.4 src/sys/kern/vfs_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/kern/vfs_vnops.c
diff -u src/sys/kern/vfs_vnops.c:1.204.2.3 src/sys/kern/vfs_vnops.c:1.204.2.4
--- src/sys/kern/vfs_vnops.c:1.204.2.3	Sat Feb 29 20:21:03 2020
+++ src/sys/kern/vfs_vnops.c	Sat Feb 29 22:00:03 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: vfs_vnops.c,v 1.204.2.3 2020/02/29 20:21:03 ad Exp $	*/
+/*	$NetBSD: vfs_vnops.c,v 1.204.2.4 2020/02/29 22:00:03 ad Exp $	*/
 
 /*-
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_vnops.c,v 1.204.2.3 2020/02/29 20:21:03 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_vnops.c,v 1.204.2.4 2020/02/29 22:00:03 ad Exp $");
 
 #include "veriexec.h"
 
@@ -163,10 +163,7 @@ vn_open(struct nameidata *ndp, int fmode
 			ndp->ni_cnd.cn_flags |= FOLLOW;
 	} else {
 		ndp->ni_cnd.cn_nameiop = LOOKUP;
-		if ((fmode & O_TRUNC) == 0) /* XXXAD check nfs etc */
-			ndp->ni_cnd.cn_flags |= LOCKLEAF | LOCKSHARED;
-		else
-			ndp->ni_cnd.cn_flags |= LOCKLEAF;
+		ndp->ni_cnd.cn_flags |= LOCKLEAF;
 		if ((fmode & O_NOFOLLOW) == 0)
 			ndp->ni_cnd.cn_flags |= FOLLOW;
 	}