git: 6b88668f0bfc - main - vfs: remove dead fifoop VOP_KQFILTER implementations

[Kyle Evans]

The branch main has been updated by kevans:

URL: https://cgit.FreeBSD.org/src/commit/?id=6b88668f0bfcca09035549e25d0f3c181cd537c8

commit 6b88668f0bfcca09035549e25d0f3c181cd537c8
Author:     Kyle Evans <kevans at FreeBSD.org>
AuthorDate: 2021-10-02 05:17:57 +0000
Commit:     Kyle Evans <kevans at FreeBSD.org>
CommitDate: 2021-10-03 06:02:51 +0000

    vfs: remove dead fifoop VOP_KQFILTER implementations
    
    These began to become obsolete in d6d64f0f2c26 (r137739) and the deal
    was later sealed in 003e18aef4c4 (r137801) when vfs.fifofs.fops was
    dropped and vop-bypass for pipes became mandatory.
    
    PR:             225934
    Suggested by:   markj
    Reviewe by:     kib, markj
    Differential Revision:  https://reviews.freebsd.org/D32270
---
 sys/fs/ext2fs/ext2_vnops.c | 18 ------------------
 sys/ufs/ufs/ufs_vnops.c    | 19 -------------------
 2 files changed, 37 deletions(-)

diff --git a/sys/fs/ext2fs/ext2_vnops.c b/sys/fs/ext2fs/ext2_vnops.c
index 367d48ab68f1..e9e8c07090da 100644
--- a/sys/fs/ext2fs/ext2_vnops.c
+++ b/sys/fs/ext2fs/ext2_vnops.c
@@ -135,7 +135,6 @@ static vop_listextattr_t	ext2_listextattr;
 static vop_setextattr_t	ext2_setextattr;
 static vop_vptofh_t	ext2_vptofh;
 static vop_close_t	ext2fifo_close;
-static vop_kqfilter_t	ext2fifo_kqfilter;
 
 /* Global vfs data structures for ext2. */
 struct vop_vector ext2_vnodeops = {
@@ -191,7 +190,6 @@ struct vop_vector ext2_fifoops = {
 	.vop_fsync =		ext2_fsync,
 	.vop_getattr =		ext2_getattr,
 	.vop_inactive =		ext2_inactive,
-	.vop_kqfilter =		ext2fifo_kqfilter,
 	.vop_pathconf =		ext2_pathconf,
 	.vop_print =		ext2_print,
 	.vop_read =		VOP_PANIC,
@@ -1642,22 +1640,6 @@ ext2fifo_close(struct vop_close_args *ap)
 	return (fifo_specops.vop_close(ap));
 }
 
-/*
- * Kqfilter wrapper for fifos.
- *
- * Fall through to ext2 kqfilter routines if needed
- */
-static int
-ext2fifo_kqfilter(struct vop_kqfilter_args *ap)
-{
-	int error;
-
-	error = fifo_specops.vop_kqfilter(ap);
-	if (error)
-		error = vfs_kqfilter(ap);
-	return (error);
-}
-
 /*
  * Return POSIX pathconf information applicable to ext2 filesystems.
  */
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
index 00ec8f41f432..e962ef8ca48c 100644
--- a/sys/ufs/ufs/ufs_vnops.c
+++ b/sys/ufs/ufs/ufs_vnops.c
@@ -130,7 +130,6 @@ static vop_strategy_t	ufs_strategy;
 static vop_symlink_t	ufs_symlink;
 static vop_whiteout_t	ufs_whiteout;
 static vop_close_t	ufsfifo_close;
-static vop_kqfilter_t	ufsfifo_kqfilter;
 
 SYSCTL_NODE(_vfs, OID_AUTO, ufs, CTLFLAG_RD | CTLFLAG_MPSAFE, 0,
     "UFS filesystem");
@@ -2578,23 +2577,6 @@ ufsfifo_close(ap)
 	return (fifo_specops.vop_close(ap));
 }
 
-/*
- * Kqfilter wrapper for fifos.
- *
- * Fall through to ufs kqfilter routines if needed 
- */
-static int
-ufsfifo_kqfilter(ap)
-	struct vop_kqfilter_args *ap;
-{
-	int error;
-
-	error = fifo_specops.vop_kqfilter(ap);
-	if (error)
-		error = vfs_kqfilter(ap);
-	return (error);
-}
-
 /*
  * Return POSIX pathconf information applicable to ufs filesystems.
  */
@@ -3013,7 +2995,6 @@ struct vop_vector ufs_fifoops = {
 	.vop_close =		ufsfifo_close,
 	.vop_getattr =		ufs_getattr,
 	.vop_inactive =		ufs_inactive,
-	.vop_kqfilter =		ufsfifo_kqfilter,
 	.vop_pathconf = 	ufs_pathconf,
 	.vop_print =		ufs_print,
 	.vop_read =		VOP_PANIC,