Module Name: src Committed By: thorpej Date: Mon Oct 11 01:49:08 UTC 2021
Modified Files: src/sys/miscfs/genfs: genfs_vnops.c src/sys/nfs: nfs_kq.c Log Message: Mark the EVFILT_VNODE filters MP-safe. To generate a diff of this commit: cvs rdiff -u -r1.214 -r1.215 src/sys/miscfs/genfs/genfs_vnops.c cvs rdiff -u -r1.30 -r1.31 src/sys/nfs/nfs_kq.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/miscfs/genfs/genfs_vnops.c diff -u src/sys/miscfs/genfs/genfs_vnops.c:1.214 src/sys/miscfs/genfs/genfs_vnops.c:1.215 --- src/sys/miscfs/genfs/genfs_vnops.c:1.214 Mon Oct 11 01:07:36 2021 +++ src/sys/miscfs/genfs/genfs_vnops.c Mon Oct 11 01:49:08 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: genfs_vnops.c,v 1.214 2021/10/11 01:07:36 thorpej Exp $ */ +/* $NetBSD: genfs_vnops.c,v 1.215 2021/10/11 01:49:08 thorpej Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -57,7 +57,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: genfs_vnops.c,v 1.214 2021/10/11 01:07:36 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: genfs_vnops.c,v 1.215 2021/10/11 01:49:08 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -596,21 +596,21 @@ filt_genfsvnode(struct knote *kn, long h } static const struct filterops genfsread_filtops = { - .f_flags = FILTEROP_ISFD, + .f_flags = FILTEROP_ISFD | FILTEROP_MPSAFE, .f_attach = NULL, .f_detach = filt_genfsdetach, .f_event = filt_genfsread, }; static const struct filterops genfswrite_filtops = { - .f_flags = FILTEROP_ISFD, + .f_flags = FILTEROP_ISFD | FILTEROP_MPSAFE, .f_attach = NULL, .f_detach = filt_genfsdetach, .f_event = filt_genfswrite, }; static const struct filterops genfsvnode_filtops = { - .f_flags = FILTEROP_ISFD, + .f_flags = FILTEROP_ISFD | FILTEROP_MPSAFE, .f_attach = NULL, .f_detach = filt_genfsdetach, .f_event = filt_genfsvnode, Index: src/sys/nfs/nfs_kq.c diff -u src/sys/nfs/nfs_kq.c:1.30 src/sys/nfs/nfs_kq.c:1.31 --- src/sys/nfs/nfs_kq.c:1.30 Mon Oct 11 01:07:36 2021 +++ src/sys/nfs/nfs_kq.c Mon Oct 11 01:49:08 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: nfs_kq.c,v 1.30 2021/10/11 01:07:36 thorpej Exp $ */ +/* $NetBSD: nfs_kq.c,v 1.31 2021/10/11 01:49:08 thorpej Exp $ */ /*- * Copyright (c) 2002, 2008 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: nfs_kq.c,v 1.30 2021/10/11 01:07:36 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nfs_kq.c,v 1.31 2021/10/11 01:49:08 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -277,14 +277,14 @@ filt_nfsvnode(struct knote *kn, long hin static const struct filterops nfsread_filtops = { - .f_flags = FILTEROP_ISFD, + .f_flags = FILTEROP_ISFD | FILTEROP_MPSAFE, .f_attach = NULL, .f_detach = filt_nfsdetach, .f_event = filt_nfsread, }; static const struct filterops nfsvnode_filtops = { - .f_flags = FILTEROP_ISFD, + .f_flags = FILTEROP_ISFD | FILTEROP_MPSAFE, .f_attach = NULL, .f_detach = filt_nfsdetach, .f_event = filt_nfsvnode,