CVS commit: [netbsd-9] src/sys/kern

[Martin Husemann]

Module Name:    src
Committed By:   martin
Date:           Tue May 19 16:24:38 UTC 2020

Modified Files:
        src/sys/kern [netbsd-9]: vnode_if.c vnode_if.src

Log Message:
Pull up following revision(s) (requested by hannken in ticket #917):

        sys/kern/vnode_if.src: revision 1.80
        sys/kern/vnode_if.c: revision 1.112

VOP_STRATEGY() may still deadlock with devices.

Change FSTRANS from LAZY to NO.

Regen.


To generate a diff of this commit:
cvs rdiff -u -r1.107.10.1 -r1.107.10.2 src/sys/kern/vnode_if.c
cvs rdiff -u -r1.77.10.1 -r1.77.10.2 src/sys/kern/vnode_if.src

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/vnode_if.c
diff -u src/sys/kern/vnode_if.c:1.107.10.1 src/sys/kern/vnode_if.c:1.107.10.2
--- src/sys/kern/vnode_if.c:1.107.10.1	Tue Oct 15 18:13:55 2019
+++ src/sys/kern/vnode_if.c	Tue May 19 16:24:38 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: vnode_if.c,v 1.107.10.1 2019/10/15 18:13:55 martin Exp $	*/
+/*	$NetBSD: vnode_if.c,v 1.107.10.2 2020/05/19 16:24:38 martin Exp $	*/
 
 /*
  * Warning: DO NOT EDIT! This file is automatically generated!
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vnode_if.c,v 1.107.10.1 2019/10/15 18:13:55 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnode_if.c,v 1.107.10.2 2020/05/19 16:24:38 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/mount.h>
@@ -1380,11 +1380,11 @@ VOP_STRATEGY(struct vnode *vp,
 	a.a_desc = VDESC(vop_strategy);
 	a.a_vp = vp;
 	a.a_bp = bp;
-	error = vop_pre(vp, &mp, &mpsafe, FST_LAZY);
+	error = vop_pre(vp, &mp, &mpsafe, FST_NO);
 	if (error)
 		return error;
 	error = (VCALL(vp, VOFFSET(vop_strategy), &a));
-	vop_post(vp, mp, mpsafe, FST_LAZY);
+	vop_post(vp, mp, mpsafe, FST_NO);
 	return error;
 }
 

Index: src/sys/kern/vnode_if.src
diff -u src/sys/kern/vnode_if.src:1.77.10.1 src/sys/kern/vnode_if.src:1.77.10.2
--- src/sys/kern/vnode_if.src:1.77.10.1	Tue Oct 15 18:12:25 2019
+++ src/sys/kern/vnode_if.src	Tue May 19 16:24:38 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: vnode_if.src,v 1.77.10.1 2019/10/15 18:12:25 martin Exp $
+#	$NetBSD: vnode_if.src,v 1.77.10.2 2020/05/19 16:24:38 martin Exp $
 #
 # Copyright (c) 1992, 1993
 #	The Regents of the University of California.  All rights reserved.
@@ -436,7 +436,7 @@ vop_bmap {
 #% strategy   vp      = = =
 #
 vop_strategy {
-	FSTRANS=LAZY
+	FSTRANS=NO
 	IN struct vnode *vp;
 	IN struct buf *bp;
 };