Module Name: src
Committed By: thorpej
Date: Mon Jul 18 04:32:35 UTC 2022
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:
Make kqueue event status for vnodes shareable, and for stacked file systems
like nullfs, make the upper vnode share that status with the lower vnode.
And, lo, NetBSD 9.99.99.
Fixes PR kern/56713.
To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.118 src/sys/kern/vnode_if.c
cvs rdiff -u -r1.39 -r1.40 src/sys/rump/include/rump/rumpvnode_if.h
cvs rdiff -u -r1.39 -r1.40 src/sys/rump/librump/rumpvfs/rumpvnode_if.c
cvs rdiff -u -r1.110 -r1.111 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.117 src/sys/kern/vnode_if.c:1.118
--- src/sys/kern/vnode_if.c:1.117 Tue May 3 13:55:29 2022
+++ src/sys/kern/vnode_if.c Mon Jul 18 04:32:35 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: vnode_if.c,v 1.117 2022/05/03 13:55:29 hannken Exp $ */
+/* $NetBSD: vnode_if.c,v 1.118 2022/07/18 04:32:35 thorpej Exp $ */
/*
* Warning: DO NOT EDIT! This file is automatically generated!
@@ -7,7 +7,7 @@
* Created from the file:
* NetBSD: vnode_if.src,v 1.84 2022/05/03 08:33:59 hannken Exp
* by the script:
- * NetBSD: vnode_if.sh,v 1.75 2022/05/03 13:54:18 hannken Exp
+ * NetBSD: vnode_if.sh,v 1.76 2022/07/18 04:30:30 thorpej Exp
*/
/*
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vnode_if.c,v 1.117 2022/05/03 13:55:29 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnode_if.c,v 1.118 2022/07/18 04:32:35 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_vnode_lockdebug.h"
@@ -137,7 +137,7 @@ do { \
*/ \
mutex_enter((thisvp)->v_interlock); \
if (__predict_true((e) == 0)) { \
- knote(&(thisvp)->v_klist, (n)); \
+ knote(&(thisvp)->v_klist->vk_klist, (n)); \
} \
holdrelel((thisvp)); \
mutex_exit((thisvp)->v_interlock); \
@@ -250,7 +250,7 @@ do { \
* meaningless from the watcher's perspective. \
*/ \
if (__predict_true(thisvp->v_op != dead_vnodeop_p)) { \
- knote(&thisvp->v_klist, \
+ knote(&thisvp->v_klist->vk_klist, \
((ap)->a_fflag & FWRITE) \
? NOTE_CLOSE_WRITE : NOTE_CLOSE); \
} \
Index: src/sys/rump/include/rump/rumpvnode_if.h
diff -u src/sys/rump/include/rump/rumpvnode_if.h:1.39 src/sys/rump/include/rump/rumpvnode_if.h:1.40
--- src/sys/rump/include/rump/rumpvnode_if.h:1.39 Tue May 3 13:55:29 2022
+++ src/sys/rump/include/rump/rumpvnode_if.h Mon Jul 18 04:32:35 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpvnode_if.h,v 1.39 2022/05/03 13:55:29 hannken Exp $ */
+/* $NetBSD: rumpvnode_if.h,v 1.40 2022/07/18 04:32:35 thorpej Exp $ */
/*
* Warning: DO NOT EDIT! This file is automatically generated!
@@ -7,7 +7,7 @@
* Created from the file:
* NetBSD: vnode_if.src,v 1.84 2022/05/03 08:33:59 hannken Exp
* by the script:
- * NetBSD: vnode_if.sh,v 1.75 2022/05/03 13:54:18 hannken Exp
+ * NetBSD: vnode_if.sh,v 1.76 2022/07/18 04:30:30 thorpej Exp
*/
/*
Index: src/sys/rump/librump/rumpvfs/rumpvnode_if.c
diff -u src/sys/rump/librump/rumpvfs/rumpvnode_if.c:1.39 src/sys/rump/librump/rumpvfs/rumpvnode_if.c:1.40
--- src/sys/rump/librump/rumpvfs/rumpvnode_if.c:1.39 Tue May 3 13:55:29 2022
+++ src/sys/rump/librump/rumpvfs/rumpvnode_if.c Mon Jul 18 04:32:35 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpvnode_if.c,v 1.39 2022/05/03 13:55:29 hannken Exp $ */
+/* $NetBSD: rumpvnode_if.c,v 1.40 2022/07/18 04:32:35 thorpej Exp $ */
/*
* Warning: DO NOT EDIT! This file is automatically generated!
@@ -7,7 +7,7 @@
* Created from the file:
* NetBSD: vnode_if.src,v 1.84 2022/05/03 08:33:59 hannken Exp
* by the script:
- * NetBSD: vnode_if.sh,v 1.75 2022/05/03 13:54:18 hannken Exp
+ * NetBSD: vnode_if.sh,v 1.76 2022/07/18 04:30:30 thorpej Exp
*/
/*
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rumpvnode_if.c,v 1.39 2022/05/03 13:55:29 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rumpvnode_if.c,v 1.40 2022/07/18 04:32:35 thorpej 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.110 src/sys/sys/vnode_if.h:1.111
--- src/sys/sys/vnode_if.h:1.110 Tue May 3 13:55:29 2022
+++ src/sys/sys/vnode_if.h Mon Jul 18 04:32:35 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: vnode_if.h,v 1.110 2022/05/03 13:55:29 hannken Exp $ */
+/* $NetBSD: vnode_if.h,v 1.111 2022/07/18 04:32:35 thorpej Exp $ */
/*
* Warning: DO NOT EDIT! This file is automatically generated!
@@ -7,7 +7,7 @@
* Created from the file:
* NetBSD: vnode_if.src,v 1.84 2022/05/03 08:33:59 hannken Exp
* by the script:
- * NetBSD: vnode_if.sh,v 1.75 2022/05/03 13:54:18 hannken Exp
+ * NetBSD: vnode_if.sh,v 1.76 2022/07/18 04:30:30 thorpej Exp
*/
/*
