[src/trunk]: src/sys Regen for VOP_LOCK & LK_UPGRADE/LK_DOWNGRADE.

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

details:   https://anonhg.NetBSD.org/src/rev/99259d1c881b
branches:  trunk
changeset: 967137:99259d1c881b
user:      ad <ad%NetBSD.org@localhost>
date:      Sun Dec 01 13:58:52 2019 +0000

description:
Regen for VOP_LOCK & LK_UPGRADE/LK_DOWNGRADE.

diffstat:

 sys/kern/vnode_if.c                     |  12 ++++++------
 sys/rump/include/rump/rumpvnode_if.h    |   6 +++---
 sys/rump/librump/rumpvfs/rumpvnode_if.c |   8 ++++----
 sys/sys/vnode_if.h                      |   6 +++---
 4 files changed, 16 insertions(+), 16 deletions(-)

diffs (112 lines):

diff -r ce08720611f3 -r 99259d1c881b sys/kern/vnode_if.c
--- a/sys/kern/vnode_if.c       Sun Dec 01 13:56:29 2019 +0000
+++ b/sys/kern/vnode_if.c       Sun Dec 01 13:58:52 2019 +0000
@@ -1,13 +1,13 @@
-/*     $NetBSD: vnode_if.c,v 1.108 2019/10/11 08:05:19 hannken Exp $   */
+/*     $NetBSD: vnode_if.c,v 1.109 2019/12/01 13:58:52 ad Exp $        */
 
 /*
  * Warning: DO NOT EDIT! This file is automatically generated!
  * (Modifications made here may easily be lost!)
  *
  * Created from the file:
- *     NetBSD: vnode_if.src,v 1.77 2017/07/12 09:31:07 hannken Exp
+ *     NetBSD: vnode_if.src,v 1.78 2019/10/11 08:04:52 hannken Exp
  * by the script:
- *     NetBSD: vnode_if.sh,v 1.66 2017/06/04 08:03:26 hannken Exp
+ *     NetBSD: vnode_if.sh,v 1.68 2019/12/01 13:56:29 ad Exp
  */
 
 /*
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vnode_if.c,v 1.108 2019/10/11 08:05:19 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnode_if.c,v 1.109 2019/12/01 13:58:52 ad Exp $");
 
 #include <sys/param.h>
 #include <sys/mount.h>
@@ -1280,11 +1280,11 @@
        a.a_desc = VDESC(vop_lock);
        a.a_vp = vp;
        a.a_flags = flags;
-       error = vop_pre(vp, &mp, &mpsafe, (flags & LK_NOWAIT ? FST_TRY : FST_YES));
+       error = vop_pre(vp, &mp, &mpsafe, (flags & (LK_UPGRADE|LK_DOWNGRADE) ? FST_NO : (flags & LK_NOWAIT ? FST_TRY : FST_YES)));
        if (error)
                return error;
        error = (VCALL(vp, VOFFSET(vop_lock), &a));
-       vop_post(vp, mp, mpsafe, (error ? FST_YES : FST_NO));
+       vop_post(vp, mp, mpsafe, (flags & (LK_UPGRADE|LK_DOWNGRADE) ? FST_NO : (error ? FST_YES : FST_NO)));
        return error;
 }
 
diff -r ce08720611f3 -r 99259d1c881b sys/rump/include/rump/rumpvnode_if.h
--- a/sys/rump/include/rump/rumpvnode_if.h      Sun Dec 01 13:56:29 2019 +0000
+++ b/sys/rump/include/rump/rumpvnode_if.h      Sun Dec 01 13:58:52 2019 +0000
@@ -1,13 +1,13 @@
-/*     $NetBSD: rumpvnode_if.h,v 1.31 2017/07/12 09:31:59 hannken Exp $        */
+/*     $NetBSD: rumpvnode_if.h,v 1.32 2019/12/01 13:58:52 ad Exp $     */
 
 /*
  * Warning: DO NOT EDIT! This file is automatically generated!
  * (Modifications made here may easily be lost!)
  *
  * Created from the file:
- *     NetBSD: vnode_if.src,v 1.77 2017/07/12 09:31:07 hannken Exp
+ *     NetBSD: vnode_if.src,v 1.78 2019/10/11 08:04:52 hannken Exp
  * by the script:
- *     NetBSD: vnode_if.sh,v 1.66 2017/06/04 08:03:26 hannken Exp
+ *     NetBSD: vnode_if.sh,v 1.68 2019/12/01 13:56:29 ad Exp
  */
 
 /*
diff -r ce08720611f3 -r 99259d1c881b sys/rump/librump/rumpvfs/rumpvnode_if.c
--- a/sys/rump/librump/rumpvfs/rumpvnode_if.c   Sun Dec 01 13:56:29 2019 +0000
+++ b/sys/rump/librump/rumpvfs/rumpvnode_if.c   Sun Dec 01 13:58:52 2019 +0000
@@ -1,13 +1,13 @@
-/*     $NetBSD: rumpvnode_if.c,v 1.31 2017/07/12 09:31:59 hannken Exp $        */
+/*     $NetBSD: rumpvnode_if.c,v 1.32 2019/12/01 13:58:53 ad Exp $     */
 
 /*
  * Warning: DO NOT EDIT! This file is automatically generated!
  * (Modifications made here may easily be lost!)
  *
  * Created from the file:
- *     NetBSD: vnode_if.src,v 1.77 2017/07/12 09:31:07 hannken Exp
+ *     NetBSD: vnode_if.src,v 1.78 2019/10/11 08:04:52 hannken Exp
  * by the script:
- *     NetBSD: vnode_if.sh,v 1.66 2017/06/04 08:03:26 hannken Exp
+ *     NetBSD: vnode_if.sh,v 1.68 2019/12/01 13:56:29 ad Exp
  */
 
 /*
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rumpvnode_if.c,v 1.31 2017/07/12 09:31:59 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rumpvnode_if.c,v 1.32 2019/12/01 13:58:53 ad Exp $");
 
 #include <sys/param.h>
 #include <sys/mount.h>
diff -r ce08720611f3 -r 99259d1c881b sys/sys/vnode_if.h
--- a/sys/sys/vnode_if.h        Sun Dec 01 13:56:29 2019 +0000
+++ b/sys/sys/vnode_if.h        Sun Dec 01 13:58:52 2019 +0000
@@ -1,13 +1,13 @@
-/*     $NetBSD: vnode_if.h,v 1.102 2017/07/12 09:32:00 hannken Exp $   */
+/*     $NetBSD: vnode_if.h,v 1.103 2019/12/01 13:58:53 ad Exp $        */
 
 /*
  * Warning: DO NOT EDIT! This file is automatically generated!
  * (Modifications made here may easily be lost!)
  *
  * Created from the file:
- *     NetBSD: vnode_if.src,v 1.77 2017/07/12 09:31:07 hannken Exp
+ *     NetBSD: vnode_if.src,v 1.78 2019/10/11 08:04:52 hannken Exp
  * by the script:
- *     NetBSD: vnode_if.sh,v 1.66 2017/06/04 08:03:26 hannken Exp
+ *     NetBSD: vnode_if.sh,v 1.68 2019/12/01 13:56:29 ad Exp
  */
 
 /*