diff options
author | phk <phk@FreeBSD.org> | 1999-08-08 18:43:05 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 1999-08-08 18:43:05 +0000 |
commit | e938d317d57f5bdbcd03330bb1290da29802187d (patch) | |
tree | 3c9ed3dde7ffaca65d359ae0e230b6e3e4e6f8ca /sys/miscfs/specfs | |
parent | 909603ec05eff128d9bdd1107a650a817c460e20 (diff) | |
download | FreeBSD-src-e938d317d57f5bdbcd03330bb1290da29802187d.zip FreeBSD-src-e938d317d57f5bdbcd03330bb1290da29802187d.tar.gz |
Decommision miscfs/specfs/specdev.h. Most of it goes into <sys/conf.h>,
a few lines into <sys/vnode.h>.
Add a few fields to struct specinfo, paving the way for the fun part.
Diffstat (limited to 'sys/miscfs/specfs')
-rw-r--r-- | sys/miscfs/specfs/spec_vnops.c | 4 | ||||
-rw-r--r-- | sys/miscfs/specfs/specdev.h | 76 |
2 files changed, 1 insertions, 79 deletions
diff --git a/sys/miscfs/specfs/spec_vnops.c b/sys/miscfs/specfs/spec_vnops.c index 9dff63d..29d0d7b 100644 --- a/sys/miscfs/specfs/spec_vnops.c +++ b/sys/miscfs/specfs/spec_vnops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)spec_vnops.c 8.14 (Berkeley) 5/21/95 - * $Id: spec_vnops.c,v 1.89 1999/06/26 02:46:21 mckusick Exp $ + * $Id: spec_vnops.c,v 1.90 1999/07/20 09:47:45 phk Exp $ */ #include <sys/param.h> @@ -55,8 +55,6 @@ #include <vm/vnode_pager.h> #include <vm/vm_extern.h> -#include <miscfs/specfs/specdev.h> - static int spec_advlock __P((struct vop_advlock_args *)); static int spec_badop __P((void)); static int spec_bmap __P((struct vop_bmap_args *)); diff --git a/sys/miscfs/specfs/specdev.h b/sys/miscfs/specfs/specdev.h deleted file mode 100644 index 3150b49..0000000 --- a/sys/miscfs/specfs/specdev.h +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Copyright (c) 1990, 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 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. - * - * @(#)specdev.h 8.6 (Berkeley) 5/21/95 - * $Id: specdev.h,v 1.17 1999/05/11 19:54:39 phk Exp $ - */ - -/* - * This structure defines the information maintained about - * special devices. It is allocated in checkalias and freed - * in vgone. - */ -struct specinfo { - struct mount *si_mountpoint; - int si_bsize_phys; /* minimum physical block size */ - int si_bsize_best; /* optimal block size / VBLK */ - int si_bsize_max; /* maximum block size */ - - udev_t si_udev; - SLIST_ENTRY(specinfo) si_hash; - struct vnode *si_hlist; -}; -/* - * Exported shorthand - */ -#define v_hashchain v_specinfo->si_hlist -#define v_specmountpoint v_specinfo->si_mountpoint - -/* - * Special device management - */ -#define SPECHSZ 64 -#define SPECHASH(rdev) (((unsigned)(minor(rdev)))%SPECHSZ) - - -/* - * Prototypes for special file operations on vnodes. - */ -extern vop_t **spec_vnodeop_p; -struct nameidata; -struct componentname; -struct ucred; -struct flock; -struct buf; -struct uio; - -int spec_vnoperate __P((struct vop_generic_args *)); |