diff options
author | kib <kib@FreeBSD.org> | 2012-03-11 12:19:58 +0000 |
---|---|---|
committer | kib <kib@FreeBSD.org> | 2012-03-11 12:19:58 +0000 |
commit | 8adabb0356f0bb9d2681f2b8641d303ff20116f1 (patch) | |
tree | 2f329a4d66d341eb7a690b2d1dfb1e5424699cfb | |
parent | 3cb00e347a6d3134d8cc77576a9aa19ed4375839 (diff) | |
download | FreeBSD-src-8adabb0356f0bb9d2681f2b8641d303ff20116f1.zip FreeBSD-src-8adabb0356f0bb9d2681f2b8641d303ff20116f1.tar.gz |
Remove fifo.h. The only used function declaration from the header is
migrated to sys/vnode.h.
Submitted by: gianni
-rw-r--r-- | ObsoleteFiles.inc | 3 | ||||
-rw-r--r-- | include/Makefile | 2 | ||||
-rw-r--r-- | sys/fs/cd9660/cd9660_vnops.c | 1 | ||||
-rw-r--r-- | sys/fs/ext2fs/ext2_vnops.c | 2 | ||||
-rw-r--r-- | sys/fs/fifofs/fifo.h | 38 | ||||
-rw-r--r-- | sys/fs/fifofs/fifo_vnops.c | 1 | ||||
-rw-r--r-- | sys/fs/nfs/nfsport.h | 1 | ||||
-rw-r--r-- | sys/fs/tmpfs/tmpfs_vnops.c | 1 | ||||
-rw-r--r-- | sys/fs/udf/udf_vnops.c | 1 | ||||
-rw-r--r-- | sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c | 2 | ||||
-rw-r--r-- | sys/kern/sys_pipe.c | 2 | ||||
-rw-r--r-- | sys/nfsclient/nfs_vnops.c | 2 | ||||
-rw-r--r-- | sys/sys/vnode.h | 3 | ||||
-rw-r--r-- | sys/ufs/ufs/ufs_vnops.c | 2 |
14 files changed, 7 insertions, 54 deletions
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index c95af4e..4aec876 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -38,6 +38,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20120309: Remove fifofs header files. +OLD_FILES+=usr/include/fs/fifofs/fifo.h +OLD_DIRS+=usr/include/fs/fifofs # 20120225: libarchive 3.0.3 OLD_FILES+=usr/share/man/man3/archive_read_data_into_buffer.3.gz \ usr/share/man/man3/archive_read_support_compression_all.3.gz \ diff --git a/include/Makefile b/include/Makefile index e54f9cd..2cbc9d2 100644 --- a/include/Makefile +++ b/include/Makefile @@ -43,7 +43,7 @@ LSUBDIRS= cam/ata cam/scsi \ dev/ic dev/iicbus ${_dev_ieee488} dev/io dev/lmc dev/mfi dev/ofw \ dev/pbio ${_dev_powermac_nvram} dev/ppbus dev/smbus \ dev/speaker dev/usb dev/utopia dev/vkbd dev/wi \ - fs/devfs fs/fdescfs fs/fifofs fs/msdosfs fs/nfs fs/ntfs fs/nullfs \ + fs/devfs fs/fdescfs fs/msdosfs fs/nfs fs/ntfs fs/nullfs \ ${_fs_nwfs} fs/portalfs fs/procfs fs/smbfs fs/udf fs/unionfs \ geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \ geom/mirror geom/mountver geom/multipath geom/nop \ diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c index ab59640..21ee0fc 100644 --- a/sys/fs/cd9660/cd9660_vnops.c +++ b/sys/fs/cd9660/cd9660_vnops.c @@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$"); #include <sys/buf.h> #include <sys/mount.h> #include <sys/vnode.h> -#include <fs/fifofs/fifo.h> #include <sys/malloc.h> #include <sys/dirent.h> #include <sys/unistd.h> diff --git a/sys/fs/ext2fs/ext2_vnops.c b/sys/fs/ext2fs/ext2_vnops.c index 136654c..5e2e318 100644 --- a/sys/fs/ext2fs/ext2_vnops.c +++ b/sys/fs/ext2fs/ext2_vnops.c @@ -71,8 +71,6 @@ #include "opt_directio.h" -#include <fs/fifofs/fifo.h> - #include <ufs/ufs/dir.h> #include <fs/ext2fs/fs.h> diff --git a/sys/fs/fifofs/fifo.h b/sys/fs/fifofs/fifo.h deleted file mode 100644 index da85ae2..0000000 --- a/sys/fs/fifofs/fifo.h +++ /dev/null @@ -1,38 +0,0 @@ -/*- - * Copyright (c) 1991, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)fifo.h 8.6 (Berkeley) 5/21/95 - * $FreeBSD$ - */ - -/* - * Prototypes for fifo operations on vnodes. - */ -int fifo_vnoperate(struct vop_generic_args *); -int fifo_printinfo(struct vnode *); - diff --git a/sys/fs/fifofs/fifo_vnops.c b/sys/fs/fifofs/fifo_vnops.c index 65c44ae..6b5d5f2 100644 --- a/sys/fs/fifofs/fifo_vnops.c +++ b/sys/fs/fifofs/fifo_vnops.c @@ -52,7 +52,6 @@ #include <sys/un.h> #include <sys/unistd.h> #include <sys/vnode.h> -#include <fs/fifofs/fifo.h> /* * This structure is associated with the FIFO vnode and stores diff --git a/sys/fs/nfs/nfsport.h b/sys/fs/nfs/nfsport.h index 763e2bd..eb026bc 100644 --- a/sys/fs/nfs/nfsport.h +++ b/sys/fs/nfs/nfsport.h @@ -78,7 +78,6 @@ #include <sys/priv.h> #include <sys/kthread.h> #include <sys/syscallsubr.h> -#include <fs/fifofs/fifo.h> #include <net/if.h> #include <net/radix.h> #include <net/route.h> diff --git a/sys/fs/tmpfs/tmpfs_vnops.c b/sys/fs/tmpfs/tmpfs_vnops.c index d5cae29..704f127 100644 --- a/sys/fs/tmpfs/tmpfs_vnops.c +++ b/sys/fs/tmpfs/tmpfs_vnops.c @@ -54,7 +54,6 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_page.h> #include <vm/vm_pager.h> -#include <fs/fifofs/fifo.h> #include <fs/tmpfs/tmpfs_vnops.h> #include <fs/tmpfs/tmpfs.h> diff --git a/sys/fs/udf/udf_vnops.c b/sys/fs/udf/udf_vnops.c index 7a99fcb..b1a3b1d 100644 --- a/sys/fs/udf/udf_vnops.c +++ b/sys/fs/udf/udf_vnops.c @@ -48,7 +48,6 @@ #include <vm/uma.h> -#include <fs/fifofs/fifo.h> #include <fs/udf/ecma167-udf.h> #include <fs/udf/osta.h> #include <fs/udf/udf.h> diff --git a/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c b/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c index b935b64..01aa0e5 100644 --- a/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c +++ b/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c @@ -46,8 +46,6 @@ #include <vm/vm_pager.h> #include <vm/vnode_pager.h> -#include <fs/fifofs/fifo.h> - #define NO_VFS_MACROS #include "xfs.h" #include "xfs_types.h" diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c index e973c22..6719bda 100644 --- a/sys/kern/sys_pipe.c +++ b/sys/kern/sys_pipe.c @@ -129,8 +129,6 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_page.h> #include <vm/uma.h> -#include <fs/fifofs/fifo.h> - /* * Use this define if you want to disable *fancy* VM things. Expect an * approx 30% decrease in transfer rate. This could be useful for diff --git a/sys/nfsclient/nfs_vnops.c b/sys/nfsclient/nfs_vnops.c index 191ed40..872317b 100644 --- a/sys/nfsclient/nfs_vnops.c +++ b/sys/nfsclient/nfs_vnops.c @@ -67,8 +67,6 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_extern.h> #include <vm/vm_object.h> -#include <fs/fifofs/fifo.h> - #include <nfs/nfsproto.h> #include <nfsclient/nfs.h> #include <nfsclient/nfsnode.h> diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index ec1d673..39d9b36 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -782,6 +782,9 @@ extern struct vop_vector default_vnodeops; #define VOP_ENOENT ((void*)(uintptr_t)vop_enoent) #define VOP_EOPNOTSUPP ((void*)(uintptr_t)vop_eopnotsupp) +/* fifo_vnops.c */ +int fifo_printinfo(struct vnode *); + /* vfs_hash.c */ typedef int vfs_hash_cmp_t(struct vnode *vp, void *arg); diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index 02ee1e0..861b67d 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -68,8 +68,6 @@ __FBSDID("$FreeBSD$"); #include <vm/vm.h> #include <vm/vm_extern.h> -#include <fs/fifofs/fifo.h> - #include <ufs/ufs/acl.h> #include <ufs/ufs/extattr.h> #include <ufs/ufs/quota.h> |