Module Name: src
Committed By: ad
Date: Sun Feb 23 22:15:19 UTC 2020
Modified Files:
src/sys/kern: vnode_if.c
src/sys/rump/include/rump: rumpvnode_if.h
src/sys/rump/librump/rumpvfs: rumpvnode_if.c
src/sys/sys: vnode_if.h
Log Message:
Regen.
To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 src/sys/kern/vnode_if.c
cvs rdiff -u -r1.32 -r1.33 src/sys/rump/include/rump/rumpvnode_if.h
cvs rdiff -u -r1.32 -r1.33 src/sys/rump/librump/rumpvfs/rumpvnode_if.c
cvs rdiff -u -r1.103 -r1.104 src/sys/sys/vnode_if.h
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.109 src/sys/kern/vnode_if.c:1.110
--- src/sys/kern/vnode_if.c:1.109 Sun Dec 1 13:58:52 2019
+++ src/sys/kern/vnode_if.c Sun Feb 23 22:15:19 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: vnode_if.c,v 1.109 2019/12/01 13:58:52 ad Exp $ */
+/* $NetBSD: vnode_if.c,v 1.110 2020/02/23 22:15:19 ad Exp $ */
/*
* Warning: DO NOT EDIT! This file is automatically generated!
@@ -7,7 +7,7 @@
* Created from the file:
* NetBSD: vnode_if.src,v 1.78 2019/10/11 08:04:52 hannken Exp
* by the script:
- * NetBSD: vnode_if.sh,v 1.68 2019/12/01 13:56:29 ad Exp
+ * NetBSD: vnode_if.sh,v 1.69 2020/02/23 22:14:04 ad Exp
*/
/*
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vnode_if.c,v 1.109 2019/12/01 13:58:52 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnode_if.c,v 1.110 2020/02/23 22:15:19 ad Exp $");
#include <sys/param.h>
#include <sys/mount.h>
@@ -1280,7 +1280,7 @@ VOP_LOCK(struct vnode *vp,
a.a_desc = VDESC(vop_lock);
a.a_vp = vp;
a.a_flags = flags;
- error = vop_pre(vp, &mp, &mpsafe, (flags & (LK_UPGRADE|LK_DOWNGRADE) ? FST_NO : (flags & LK_NOWAIT ? FST_TRY : FST_YES)));
+ error = vop_pre(vp, &mp, &mpsafe, (!(flags & (LK_SHARED|LK_EXCLUSIVE)) ? FST_NO : (flags & LK_NOWAIT ? FST_TRY : FST_YES)));
if (error)
return error;
error = (VCALL(vp, VOFFSET(vop_lock), &a));
Index: src/sys/rump/include/rump/rumpvnode_if.h
diff -u src/sys/rump/include/rump/rumpvnode_if.h:1.32 src/sys/rump/include/rump/rumpvnode_if.h:1.33
--- src/sys/rump/include/rump/rumpvnode_if.h:1.32 Sun Dec 1 13:58:52 2019
+++ src/sys/rump/include/rump/rumpvnode_if.h Sun Feb 23 22:15:19 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpvnode_if.h,v 1.32 2019/12/01 13:58:52 ad Exp $ */
+/* $NetBSD: rumpvnode_if.h,v 1.33 2020/02/23 22:15:19 ad Exp $ */
/*
* Warning: DO NOT EDIT! This file is automatically generated!
@@ -7,7 +7,7 @@
* Created from the file:
* NetBSD: vnode_if.src,v 1.78 2019/10/11 08:04:52 hannken Exp
* by the script:
- * NetBSD: vnode_if.sh,v 1.68 2019/12/01 13:56:29 ad Exp
+ * NetBSD: vnode_if.sh,v 1.69 2020/02/23 22:14:04 ad Exp
*/
/*
Index: src/sys/rump/librump/rumpvfs/rumpvnode_if.c
diff -u src/sys/rump/librump/rumpvfs/rumpvnode_if.c:1.32 src/sys/rump/librump/rumpvfs/rumpvnode_if.c:1.33
--- src/sys/rump/librump/rumpvfs/rumpvnode_if.c:1.32 Sun Dec 1 13:58:53 2019
+++ src/sys/rump/librump/rumpvfs/rumpvnode_if.c Sun Feb 23 22:15:19 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpvnode_if.c,v 1.32 2019/12/01 13:58:53 ad Exp $ */
+/* $NetBSD: rumpvnode_if.c,v 1.33 2020/02/23 22:15:19 ad Exp $ */
/*
* Warning: DO NOT EDIT! This file is automatically generated!
@@ -7,7 +7,7 @@
* Created from the file:
* NetBSD: vnode_if.src,v 1.78 2019/10/11 08:04:52 hannken Exp
* by the script:
- * NetBSD: vnode_if.sh,v 1.68 2019/12/01 13:56:29 ad Exp
+ * NetBSD: vnode_if.sh,v 1.69 2020/02/23 22:14:04 ad Exp
*/
/*
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rumpvnode_if.c,v 1.32 2019/12/01 13:58:53 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rumpvnode_if.c,v 1.33 2020/02/23 22:15:19 ad Exp $");
#include <sys/param.h>
#include <sys/mount.h>
Index: src/sys/sys/vnode_if.h
diff -u src/sys/sys/vnode_if.h:1.103 src/sys/sys/vnode_if.h:1.104
--- src/sys/sys/vnode_if.h:1.103 Sun Dec 1 13:58:53 2019
+++ src/sys/sys/vnode_if.h Sun Feb 23 22:15:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: vnode_if.h,v 1.103 2019/12/01 13:58:53 ad Exp $ */
+/* $NetBSD: vnode_if.h,v 1.104 2020/02/23 22:15:18 ad Exp $ */
/*
* Warning: DO NOT EDIT! This file is automatically generated!
@@ -7,7 +7,7 @@
* Created from the file:
* NetBSD: vnode_if.src,v 1.78 2019/10/11 08:04:52 hannken Exp
* by the script:
- * NetBSD: vnode_if.sh,v 1.68 2019/12/01 13:56:29 ad Exp
+ * NetBSD: vnode_if.sh,v 1.69 2020/02/23 22:14:04 ad Exp
*/
/*
