Module Name: src
Committed By: ad
Date: Sun Dec 1 13:58:53 UTC 2019
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 for VOP_LOCK & LK_UPGRADE/LK_DOWNGRADE.
To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.109 src/sys/kern/vnode_if.c
cvs rdiff -u -r1.31 -r1.32 src/sys/rump/include/rump/rumpvnode_if.h
cvs rdiff -u -r1.31 -r1.32 src/sys/rump/librump/rumpvfs/rumpvnode_if.c
cvs rdiff -u -r1.102 -r1.103 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.108 src/sys/kern/vnode_if.c:1.109
--- src/sys/kern/vnode_if.c:1.108 Fri Oct 11 08:05:19 2019
+++ src/sys/kern/vnode_if.c Sun Dec 1 13:58:52 2019
@@ -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 @@ 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_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;
}
Index: src/sys/rump/include/rump/rumpvnode_if.h
diff -u src/sys/rump/include/rump/rumpvnode_if.h:1.31 src/sys/rump/include/rump/rumpvnode_if.h:1.32
--- src/sys/rump/include/rump/rumpvnode_if.h:1.31 Wed Jul 12 09:31:59 2017
+++ src/sys/rump/include/rump/rumpvnode_if.h Sun Dec 1 13:58:52 2019
@@ -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
*/
/*
Index: src/sys/rump/librump/rumpvfs/rumpvnode_if.c
diff -u src/sys/rump/librump/rumpvfs/rumpvnode_if.c:1.31 src/sys/rump/librump/rumpvfs/rumpvnode_if.c:1.32
--- src/sys/rump/librump/rumpvfs/rumpvnode_if.c:1.31 Wed Jul 12 09:31:59 2017
+++ src/sys/rump/librump/rumpvfs/rumpvnode_if.c Sun Dec 1 13:58:53 2019
@@ -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>
Index: src/sys/sys/vnode_if.h
diff -u src/sys/sys/vnode_if.h:1.102 src/sys/sys/vnode_if.h:1.103
--- src/sys/sys/vnode_if.h:1.102 Wed Jul 12 09:32:00 2017
+++ src/sys/sys/vnode_if.h Sun Dec 1 13:58:53 2019
@@ -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
*/
/*
