spec_vnodeops_p now declared in specdev.h

SCCS-vsn: sys/kern/vfs_subr.c 7.85
SCCS-vsn: sys/ufs/ffs/ufs_vnops.c 7.106
SCCS-vsn: sys/ufs/ufs/ufs_vnops.c 7.106
SCCS-vsn: sys/nfs/nfs_subs.c 7.62
SCCS-vsn: sys/nfs/nfs_vnops.c 7.90

diff --git a/usr/src/sys/kern/vfs_subr.c b/usr/src/sys/kern/vfs_subr.c
index 1acd85c..a9bb3ba 100644 (file)
--- a/usr/src/sys/kern/vfs_subr.c
+++ b/usr/src/sys/kern/vfs_subr.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)vfs_subr.c  7.84 (Berkeley) %G%
+ *     @(#)vfs_subr.c  7.85 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -191,7 +191,6 @@ void vattr_null(vap)
  */
 struct vnode *vfreeh, **vfreet = &vfreeh;
 extern int (**dead_vnodeop_p)();
  */
 struct vnode *vfreeh, **vfreet = &vfreeh;
 extern int (**dead_vnodeop_p)();

-extern int (**spec_vnodeop_p)();

 extern void vclean();
 long numvnodes;
 extern struct vattr va_null;
 extern void vclean();
 long numvnodes;
 extern struct vattr va_null;

diff --git a/usr/src/sys/nfs/nfs_subs.c b/usr/src/sys/nfs/nfs_subs.c
index 29b2f7a..03cdc78 100644 (file)
--- a/usr/src/sys/nfs/nfs_subs.c
+++ b/usr/src/sys/nfs/nfs_subs.c
@@ -7,7 +7,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)nfs_subs.c  7.61 (Berkeley) %G%
+ *     @(#)nfs_subs.c  7.62 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -36,6 +36,8 @@
 #include <nfs/nqnfs.h>
 #include <nfs/nfsrtt.h>
 
 #include <nfs/nqnfs.h>
 #include <nfs/nfsrtt.h>
 

+#include <miscfs/specfs/specdev.h>
+

 #include <netinet/in.h>
 #ifdef ISO
 #include <netiso/iso.h>
 #include <netinet/in.h>
 #ifdef ISO
 #include <netiso/iso.h>


@@ -633,7 +635,6 @@ nfs_loadattrcache(vpp, mdp, dposp, vaper)
        register struct vattr *vap;
        register struct nfsv2_fattr *fp;
        extern int (**spec_nfsv2nodeop_p)();
        register struct vattr *vap;
        register struct nfsv2_fattr *fp;
        extern int (**spec_nfsv2nodeop_p)();

-       extern int (**spec_vnodeop_p)();

        register struct nfsnode *np, *nq, **nhpp;
        register long t1;
        caddr_t dpos, cp2;
        register struct nfsnode *np, *nq, **nhpp;
        register long t1;
        caddr_t dpos, cp2;

diff --git a/usr/src/sys/nfs/nfs_vnops.c b/usr/src/sys/nfs/nfs_vnops.c
index 75cf141..16c94a4 100644 (file)
--- a/usr/src/sys/nfs/nfs_vnops.c
+++ b/usr/src/sys/nfs/nfs_vnops.c
@@ -7,7 +7,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)nfs_vnops.c 7.89 (Berkeley) %G%
+ *     @(#)nfs_vnops.c 7.90 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -2269,7 +2269,6 @@ nfsspec_read(ap)
                struct ucred *a_cred;
        } */ *ap;
 {
                struct ucred *a_cred;
        } */ *ap;
 {

-       extern int (**spec_vnodeop_p)();

        register struct nfsnode *np = VTONFS(ap->a_vp);
 
        /*
        register struct nfsnode *np = VTONFS(ap->a_vp);
 
        /*


@@ -2292,7 +2291,6 @@ nfsspec_write(ap)
                struct ucred *a_cred;
        } */ *ap;
 {
                struct ucred *a_cred;
        } */ *ap;
 {

-       extern int (**spec_vnodeop_p)();

        register struct nfsnode *np = VTONFS(ap->a_vp);
 
        /*
        register struct nfsnode *np = VTONFS(ap->a_vp);
 
        /*


@@ -2320,7 +2318,6 @@ nfsspec_close(ap)
        register struct vnode *vp = ap->a_vp;
        register struct nfsnode *np = VTONFS(vp);
        struct vattr vattr;
        register struct vnode *vp = ap->a_vp;
        register struct nfsnode *np = VTONFS(vp);
        struct vattr vattr;

-       extern int (**spec_vnodeop_p)();

 
        if (np->n_flag & (NACC | NUPD)) {
                if (np->n_flag & NACC)
 
        if (np->n_flag & (NACC | NUPD)) {
                if (np->n_flag & NACC)

diff --git a/usr/src/sys/ufs/ffs/ufs_vnops.c b/usr/src/sys/ufs/ffs/ufs_vnops.c
index 4598a45..4e2a54d 100644 (file)
--- a/usr/src/sys/ufs/ffs/ufs_vnops.c
+++ b/usr/src/sys/ufs/ffs/ufs_vnops.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ufs_vnops.c 7.105 (Berkeley) %G%
+ *     @(#)ufs_vnops.c 7.106 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -1643,7 +1643,6 @@ ufsspec_read(ap)
                struct ucred *a_cred;
        } */ *ap;
 {
                struct ucred *a_cred;
        } */ *ap;
 {

-       extern int (**spec_vnodeop_p)();

 
        /*
         * Set access flag.
 
        /*
         * Set access flag.


@@ -1664,7 +1663,6 @@ ufsspec_write(ap)
                struct ucred *a_cred;
        } */ *ap;
 {
                struct ucred *a_cred;
        } */ *ap;
 {

-       extern int (**spec_vnodeop_p)();

 
        /*
         * Set update and change flags.
 
        /*
         * Set update and change flags.


@@ -1687,7 +1685,6 @@ ufsspec_close(ap)
                struct proc *a_p;
        } */ *ap;
 {
                struct proc *a_p;
        } */ *ap;
 {

-       extern int (**spec_vnodeop_p)();

        register struct inode *ip = VTOI(ap->a_vp);
 
        if (ap->a_vp->v_usecount > 1 && !(ip->i_flag & ILOCKED))
        register struct inode *ip = VTOI(ap->a_vp);
 
        if (ap->a_vp->v_usecount > 1 && !(ip->i_flag & ILOCKED))


@@ -1864,7 +1861,6 @@ ufs_vinit(mntp, specops, fifoops, vpp)
 {
        struct inode *ip;
        struct vnode *vp, *nvp;
 {
        struct inode *ip;
        struct vnode *vp, *nvp;

-       extern int (**spec_vnodeop_p)();

 
        vp = *vpp;
        ip = VTOI(vp);
 
        vp = *vpp;
        ip = VTOI(vp);

diff --git a/usr/src/sys/ufs/ufs/ufs_vnops.c b/usr/src/sys/ufs/ufs/ufs_vnops.c
index 4598a45..4e2a54d 100644 (file)
--- a/usr/src/sys/ufs/ufs/ufs_vnops.c
+++ b/usr/src/sys/ufs/ufs/ufs_vnops.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ufs_vnops.c 7.105 (Berkeley) %G%
+ *     @(#)ufs_vnops.c 7.106 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -1643,7 +1643,6 @@ ufsspec_read(ap)
                struct ucred *a_cred;
        } */ *ap;
 {
                struct ucred *a_cred;
        } */ *ap;
 {

-       extern int (**spec_vnodeop_p)();

 
        /*
         * Set access flag.
 
        /*
         * Set access flag.


@@ -1664,7 +1663,6 @@ ufsspec_write(ap)
                struct ucred *a_cred;
        } */ *ap;
 {
                struct ucred *a_cred;
        } */ *ap;
 {

-       extern int (**spec_vnodeop_p)();

 
        /*
         * Set update and change flags.
 
        /*
         * Set update and change flags.


@@ -1687,7 +1685,6 @@ ufsspec_close(ap)
                struct proc *a_p;
        } */ *ap;
 {
                struct proc *a_p;
        } */ *ap;
 {

-       extern int (**spec_vnodeop_p)();

        register struct inode *ip = VTOI(ap->a_vp);
 
        if (ap->a_vp->v_usecount > 1 && !(ip->i_flag & ILOCKED))
        register struct inode *ip = VTOI(ap->a_vp);
 
        if (ap->a_vp->v_usecount > 1 && !(ip->i_flag & ILOCKED))


@@ -1864,7 +1861,6 @@ ufs_vinit(mntp, specops, fifoops, vpp)
 {
        struct inode *ip;
        struct vnode *vp, *nvp;
 {
        struct inode *ip;
        struct vnode *vp, *nvp;

-       extern int (**spec_vnodeop_p)();

 
        vp = *vpp;
        ip = VTOI(vp);
 
        vp = *vpp;
        ip = VTOI(vp);