From 0f93ba7b6ffb9c5217b53b65c7d357b65ca77eca Mon Sep 17 00:00:00 2001 From: Kirk McKusick Date: Wed, 28 Mar 1990 02:13:06 -0800 Subject: [PATCH] break specinfo structure out of vnode.h into specdev.h SCCS-vsn: sys/miscfs/specfs/spec_vnops.c 7.24 SCCS-vsn: sys/kern/vfs_bio.c 7.25 SCCS-vsn: sys/kern/vfs_cluster.c 7.25 SCCS-vsn: sys/kern/vfs_subr.c 7.35 SCCS-vsn: sys/vm/vm_swap.c 7.11 SCCS-vsn: sys/kern/kern_physio.c 7.13 SCCS-vsn: sys/ufs/ffs/ffs_vfsops.c 7.38 SCCS-vsn: sys/ufs/ffs/ufs_vfsops.c 7.38 SCCS-vsn: sys/ufs/lfs/lfs_vfsops.c 7.38 SCCS-vsn: sys/ufs/ufs/ufs_vfsops.c 7.38 SCCS-vsn: sys/ufs/ffs/ffs_vnops.c 7.35 SCCS-vsn: sys/ufs/ffs/ufs_vnops.c 7.35 SCCS-vsn: sys/ufs/lfs/lfs_vnops.c 7.35 SCCS-vsn: sys/ufs/ufs/ufs_vnops.c 7.35 --- usr/src/sys/kern/kern_physio.c | 3 ++- usr/src/sys/kern/vfs_bio.c | 3 ++- usr/src/sys/kern/vfs_cluster.c | 3 ++- usr/src/sys/kern/vfs_subr.c | 17 ++--------------- usr/src/sys/miscfs/specfs/spec_vnops.c | 3 ++- usr/src/sys/ufs/ffs/ffs_vfsops.c | 5 +++-- usr/src/sys/ufs/ffs/ffs_vnops.c | 4 ++-- usr/src/sys/ufs/ffs/ufs_vfsops.c | 5 +++-- usr/src/sys/ufs/ffs/ufs_vnops.c | 4 ++-- usr/src/sys/ufs/lfs/lfs_vfsops.c | 5 +++-- usr/src/sys/ufs/lfs/lfs_vnops.c | 4 ++-- usr/src/sys/ufs/ufs/ufs_vfsops.c | 5 +++-- usr/src/sys/ufs/ufs/ufs_vnops.c | 4 ++-- usr/src/sys/vm/vm_swap.c | 3 ++- 14 files changed, 32 insertions(+), 36 deletions(-) diff --git a/usr/src/sys/kern/kern_physio.c b/usr/src/sys/kern/kern_physio.c index 3cd951b539..2907d1447c 100644 --- a/usr/src/sys/kern/kern_physio.c +++ b/usr/src/sys/kern/kern_physio.c @@ -3,7 +3,7 @@ * All rights reserved. The Berkeley software License Agreement * specifies the terms and conditions for redistribution. * - * @(#)kern_physio.c 7.12 (Berkeley) %G% + * @(#)kern_physio.c 7.13 (Berkeley) %G% */ #include "param.h" @@ -17,6 +17,7 @@ #include "trace.h" #include "map.h" #include "vnode.h" +#include "specdev.h" #include "machine/pte.h" #ifdef SECSIZE diff --git a/usr/src/sys/kern/vfs_bio.c b/usr/src/sys/kern/vfs_bio.c index a862dd98fa..121e8a4dce 100644 --- a/usr/src/sys/kern/vfs_bio.c +++ b/usr/src/sys/kern/vfs_bio.c @@ -14,13 +14,14 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * @(#)vfs_bio.c 7.24 (Berkeley) %G% + * @(#)vfs_bio.c 7.25 (Berkeley) %G% */ #include "param.h" #include "user.h" #include "buf.h" #include "vnode.h" +#include "specdev.h" #include "mount.h" #include "trace.h" #include "ucred.h" diff --git a/usr/src/sys/kern/vfs_cluster.c b/usr/src/sys/kern/vfs_cluster.c index 66605d6166..af6ea232e0 100644 --- a/usr/src/sys/kern/vfs_cluster.c +++ b/usr/src/sys/kern/vfs_cluster.c @@ -14,13 +14,14 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * @(#)vfs_cluster.c 7.24 (Berkeley) %G% + * @(#)vfs_cluster.c 7.25 (Berkeley) %G% */ #include "param.h" #include "user.h" #include "buf.h" #include "vnode.h" +#include "specdev.h" #include "mount.h" #include "trace.h" #include "ucred.h" diff --git a/usr/src/sys/kern/vfs_subr.c b/usr/src/sys/kern/vfs_subr.c index 64f239b310..ee6b9ee618 100644 --- a/usr/src/sys/kern/vfs_subr.c +++ b/usr/src/sys/kern/vfs_subr.c @@ -14,7 +14,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * @(#)vfs_subr.c 7.34 (Berkeley) %G% + * @(#)vfs_subr.c 7.35 (Berkeley) %G% */ /* @@ -25,17 +25,12 @@ #include "mount.h" #include "time.h" #include "vnode.h" +#include "specdev.h" #include "namei.h" #include "ucred.h" #include "errno.h" #include "malloc.h" -/* - * Shorthand notation. - */ -#define v_hashchain v_specinfo->si_hashchain -#define v_specnext v_specinfo->si_specnext - /* * Remove a mount point from the list of mounted filesystems. * Unmount of the root is illegal. @@ -177,14 +172,6 @@ struct vnode *vfreeh, **vfreet; extern struct vnodeops dead_vnodeops, spec_vnodeops; extern void vclean(); -#define SPECHSZ 64 -#if ((SPECHSZ&(SPECHSZ-1)) == 0) -#define SPECHASH(rdev) (((rdev>>5)+(rdev))&(SPECHSZ-1)) -#else -#define SPECHASH(rdev) (((unsigned)((rdev>>5)+(rdev)))%SPECHSZ) -#endif -struct vnode *speclisth[SPECHSZ]; - /* * Initialize the vnode structures and initialize each file system type. */ diff --git a/usr/src/sys/miscfs/specfs/spec_vnops.c b/usr/src/sys/miscfs/specfs/spec_vnops.c index 30bf109abb..43dfd09a13 100644 --- a/usr/src/sys/miscfs/specfs/spec_vnops.c +++ b/usr/src/sys/miscfs/specfs/spec_vnops.c @@ -14,7 +14,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * @(#)spec_vnops.c 7.23 (Berkeley) %G% + * @(#)spec_vnops.c 7.24 (Berkeley) %G% */ #include "param.h" @@ -25,6 +25,7 @@ #include "buf.h" #include "mount.h" #include "vnode.h" +#include "specdev.h" #include "stat.h" #include "errno.h" #include "ioctl.h" diff --git a/usr/src/sys/ufs/ffs/ffs_vfsops.c b/usr/src/sys/ufs/ffs/ffs_vfsops.c index b0b07fc85a..c4d4f4eac9 100644 --- a/usr/src/sys/ufs/ffs/ffs_vfsops.c +++ b/usr/src/sys/ufs/ffs/ffs_vfsops.c @@ -14,7 +14,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * @(#)ffs_vfsops.c 7.37 (Berkeley) %G% + * @(#)ffs_vfsops.c 7.38 (Berkeley) %G% */ #include "param.h" @@ -23,6 +23,7 @@ #include "kernel.h" #include "namei.h" #include "vnode.h" +#include "specdev.h" #include "mount.h" #include "buf.h" #include "ucred.h" @@ -301,7 +302,7 @@ mountfs(devvp, mp) ump->um_dev = dev; ump->um_devvp = devvp; ump->um_qinod = NULL; - devvp->v_specinfo->si_flags |= SI_MOUNTEDON; + devvp->v_specflags |= SI_MOUNTEDON; /* Sanity checks for old file systems. XXX */ fs->fs_npsect = MAX(fs->fs_npsect, fs->fs_nsect); /* XXX */ diff --git a/usr/src/sys/ufs/ffs/ffs_vnops.c b/usr/src/sys/ufs/ffs/ffs_vnops.c index 0d8b925fba..b43745ba48 100644 --- a/usr/src/sys/ufs/ffs/ffs_vnops.c +++ b/usr/src/sys/ufs/ffs/ffs_vnops.c @@ -14,7 +14,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * @(#)ffs_vnops.c 7.34 (Berkeley) %G% + * @(#)ffs_vnops.c 7.35 (Berkeley) %G% */ #include "param.h" @@ -25,12 +25,12 @@ #include "stat.h" #include "buf.h" #include "proc.h" -#include "uio.h" #include "socket.h" #include "socketvar.h" #include "conf.h" #include "mount.h" #include "vnode.h" +#include "specdev.h" #include "../ufs/inode.h" #include "../ufs/fs.h" #include "../ufs/quota.h" diff --git a/usr/src/sys/ufs/ffs/ufs_vfsops.c b/usr/src/sys/ufs/ffs/ufs_vfsops.c index 406b8cd2fd..e5e7eeba21 100644 --- a/usr/src/sys/ufs/ffs/ufs_vfsops.c +++ b/usr/src/sys/ufs/ffs/ufs_vfsops.c @@ -14,7 +14,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * @(#)ufs_vfsops.c 7.37 (Berkeley) %G% + * @(#)ufs_vfsops.c 7.38 (Berkeley) %G% */ #include "param.h" @@ -23,6 +23,7 @@ #include "kernel.h" #include "namei.h" #include "vnode.h" +#include "specdev.h" #include "mount.h" #include "buf.h" #include "ucred.h" @@ -301,7 +302,7 @@ mountfs(devvp, mp) ump->um_dev = dev; ump->um_devvp = devvp; ump->um_qinod = NULL; - devvp->v_specinfo->si_flags |= SI_MOUNTEDON; + devvp->v_specflags |= SI_MOUNTEDON; /* Sanity checks for old file systems. XXX */ fs->fs_npsect = MAX(fs->fs_npsect, fs->fs_nsect); /* XXX */ diff --git a/usr/src/sys/ufs/ffs/ufs_vnops.c b/usr/src/sys/ufs/ffs/ufs_vnops.c index c02a9c6a65..63556d6f81 100644 --- a/usr/src/sys/ufs/ffs/ufs_vnops.c +++ b/usr/src/sys/ufs/ffs/ufs_vnops.c @@ -14,7 +14,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * @(#)ufs_vnops.c 7.34 (Berkeley) %G% + * @(#)ufs_vnops.c 7.35 (Berkeley) %G% */ #include "param.h" @@ -25,12 +25,12 @@ #include "stat.h" #include "buf.h" #include "proc.h" -#include "uio.h" #include "socket.h" #include "socketvar.h" #include "conf.h" #include "mount.h" #include "vnode.h" +#include "specdev.h" #include "../ufs/inode.h" #include "../ufs/fs.h" #include "../ufs/quota.h" diff --git a/usr/src/sys/ufs/lfs/lfs_vfsops.c b/usr/src/sys/ufs/lfs/lfs_vfsops.c index 19f5bea2f0..a11fc2a7ef 100644 --- a/usr/src/sys/ufs/lfs/lfs_vfsops.c +++ b/usr/src/sys/ufs/lfs/lfs_vfsops.c @@ -14,7 +14,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * @(#)lfs_vfsops.c 7.37 (Berkeley) %G% + * @(#)lfs_vfsops.c 7.38 (Berkeley) %G% */ #include "param.h" @@ -23,6 +23,7 @@ #include "kernel.h" #include "namei.h" #include "vnode.h" +#include "specdev.h" #include "mount.h" #include "buf.h" #include "ucred.h" @@ -301,7 +302,7 @@ mountfs(devvp, mp) ump->um_dev = dev; ump->um_devvp = devvp; ump->um_qinod = NULL; - devvp->v_specinfo->si_flags |= SI_MOUNTEDON; + devvp->v_specflags |= SI_MOUNTEDON; /* Sanity checks for old file systems. XXX */ fs->fs_npsect = MAX(fs->fs_npsect, fs->fs_nsect); /* XXX */ diff --git a/usr/src/sys/ufs/lfs/lfs_vnops.c b/usr/src/sys/ufs/lfs/lfs_vnops.c index a09714c7b8..4c66d34e26 100644 --- a/usr/src/sys/ufs/lfs/lfs_vnops.c +++ b/usr/src/sys/ufs/lfs/lfs_vnops.c @@ -14,7 +14,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * @(#)lfs_vnops.c 7.34 (Berkeley) %G% + * @(#)lfs_vnops.c 7.35 (Berkeley) %G% */ #include "param.h" @@ -25,12 +25,12 @@ #include "stat.h" #include "buf.h" #include "proc.h" -#include "uio.h" #include "socket.h" #include "socketvar.h" #include "conf.h" #include "mount.h" #include "vnode.h" +#include "specdev.h" #include "../ufs/inode.h" #include "../ufs/fs.h" #include "../ufs/quota.h" diff --git a/usr/src/sys/ufs/ufs/ufs_vfsops.c b/usr/src/sys/ufs/ufs/ufs_vfsops.c index 406b8cd2fd..e5e7eeba21 100644 --- a/usr/src/sys/ufs/ufs/ufs_vfsops.c +++ b/usr/src/sys/ufs/ufs/ufs_vfsops.c @@ -14,7 +14,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * @(#)ufs_vfsops.c 7.37 (Berkeley) %G% + * @(#)ufs_vfsops.c 7.38 (Berkeley) %G% */ #include "param.h" @@ -23,6 +23,7 @@ #include "kernel.h" #include "namei.h" #include "vnode.h" +#include "specdev.h" #include "mount.h" #include "buf.h" #include "ucred.h" @@ -301,7 +302,7 @@ mountfs(devvp, mp) ump->um_dev = dev; ump->um_devvp = devvp; ump->um_qinod = NULL; - devvp->v_specinfo->si_flags |= SI_MOUNTEDON; + devvp->v_specflags |= SI_MOUNTEDON; /* Sanity checks for old file systems. XXX */ fs->fs_npsect = MAX(fs->fs_npsect, fs->fs_nsect); /* XXX */ diff --git a/usr/src/sys/ufs/ufs/ufs_vnops.c b/usr/src/sys/ufs/ufs/ufs_vnops.c index c02a9c6a65..63556d6f81 100644 --- a/usr/src/sys/ufs/ufs/ufs_vnops.c +++ b/usr/src/sys/ufs/ufs/ufs_vnops.c @@ -14,7 +14,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * @(#)ufs_vnops.c 7.34 (Berkeley) %G% + * @(#)ufs_vnops.c 7.35 (Berkeley) %G% */ #include "param.h" @@ -25,12 +25,12 @@ #include "stat.h" #include "buf.h" #include "proc.h" -#include "uio.h" #include "socket.h" #include "socketvar.h" #include "conf.h" #include "mount.h" #include "vnode.h" +#include "specdev.h" #include "../ufs/inode.h" #include "../ufs/fs.h" #include "../ufs/quota.h" diff --git a/usr/src/sys/vm/vm_swap.c b/usr/src/sys/vm/vm_swap.c index 7d0f5b923e..ff5d35cad3 100644 --- a/usr/src/sys/vm/vm_swap.c +++ b/usr/src/sys/vm/vm_swap.c @@ -14,7 +14,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * @(#)vm_swap.c 7.10 (Berkeley) %G% + * @(#)vm_swap.c 7.11 (Berkeley) %G% */ #include "param.h" @@ -23,6 +23,7 @@ #include "conf.h" #include "user.h" #include "vnode.h" +#include "specdev.h" #include "map.h" #include "file.h" #include "stat.h" -- 2.20.1