Author: kib
Date: Wed Jun 24 09:45:10 2009
New Revision: 194816
URL: http://svn.freebsd.org/changeset/base/194816

Log:
  MFC r193922:
  Remove unused VOP_IOCTL and VOP_KQFILTER implementations for fifofs.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/fs/fifofs/fifo_vnops.c

Modified: stable/7/sys/fs/fifofs/fifo_vnops.c
==============================================================================
--- stable/7/sys/fs/fifofs/fifo_vnops.c Wed Jun 24 09:42:18 2009        
(r194815)
+++ stable/7/sys/fs/fifofs/fifo_vnops.c Wed Jun 24 09:45:10 2009        
(r194816)
@@ -87,8 +87,6 @@ struct fifoinfo {
 static vop_print_t     fifo_print;
 static vop_open_t      fifo_open;
 static vop_close_t     fifo_close;
-static vop_ioctl_t     fifo_ioctl;
-static vop_kqfilter_t  fifo_kqfilter;
 static vop_pathconf_t  fifo_pathconf;
 static vop_advlock_t   fifo_advlock;
 
@@ -114,8 +112,8 @@ struct vop_vector fifo_specops = {
        .vop_close =            fifo_close,
        .vop_create =           VOP_PANIC,
        .vop_getattr =          VOP_EBADF,
-       .vop_ioctl =            fifo_ioctl,
-       .vop_kqfilter =         fifo_kqfilter,
+       .vop_ioctl =            VOP_PANIC,
+       .vop_kqfilter =         VOP_PANIC,
        .vop_lease =            VOP_NULL,
        .vop_link =             VOP_PANIC,
        .vop_mkdir =            VOP_PANIC,
@@ -302,42 +300,6 @@ fail1:
        return (0);
 }
 
-/*
- * Now unused vnode ioctl routine.
- */
-/* ARGSUSED */
-static int
-fifo_ioctl(ap)
-       struct vop_ioctl_args /* {
-               struct vnode *a_vp;
-               u_long  a_command;
-               caddr_t  a_data;
-               int  a_fflag;
-               struct ucred *a_cred;
-               struct thread *a_td;
-       } */ *ap;
-{
-
-       printf("WARNING: fifo_ioctl called unexpectedly\n");
-       return (ENOTTY);
-}
-
-/*
- * Now unused vnode kqfilter routine.
- */
-/* ARGSUSED */
-static int
-fifo_kqfilter(ap)
-       struct vop_kqfilter_args /* {
-               struct vnode *a_vp;
-               struct knote *a_kn;
-       } */ *ap;
-{
-
-       printf("WARNING: fifo_kqfilter called unexpectedly\n");
-       return (EINVAL);
-}
-
 static void
 filt_fifordetach(struct knote *kn)
 {
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to