[src/netbsd-9]: src/sys/kern Pull up following revision(s) (requested by hann...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3a6b0584097e
branches:  netbsd-9
changeset: 933136:3a6b0584097e
user:      martin <martin%NetBSD.org@localhost>
date:      Tue May 19 16:24:38 2020 +0000

description:
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.

diffstat:

 sys/kern/vnode_if.c   |  8 ++++----
 sys/kern/vnode_if.src |  4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (50 lines):

diff -r 2c1bb6d0e5bd -r 3a6b0584097e sys/kern/vnode_if.c
--- a/sys/kern/vnode_if.c       Mon May 18 19:07:35 2020 +0000
+++ b/sys/kern/vnode_if.c       Tue May 19 16:24:38 2020 +0000
@@ -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 @@
        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;
 }
 
diff -r 2c1bb6d0e5bd -r 3a6b0584097e sys/kern/vnode_if.src
--- a/sys/kern/vnode_if.src     Mon May 18 19:07:35 2020 +0000
+++ b/sys/kern/vnode_if.src     Tue May 19 16:24:38 2020 +0000
@@ -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 @@
 #% strategy   vp      = = =
 #
 vop_strategy {
-       FSTRANS=LAZY
+       FSTRANS=NO
        IN struct vnode *vp;
        IN struct buf *bp;
 };