move to rev 7; new include location; syntax niggles

SCCS-vsn: sys/miscfs/umapfs/umap_vnops.c 1.3

diff --git a/usr/src/sys/miscfs/umapfs/umap_vnops.c b/usr/src/sys/miscfs/umapfs/umap_vnops.c
index 77b702d..a3f34a9 100644 (file)
--- a/usr/src/sys/miscfs/umapfs/umap_vnops.c
+++ b/usr/src/sys/miscfs/umapfs/umap_vnops.c
@@ -7,9 +7,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)umap_vnops.c        7.1 (Berkeley) %G%
- *
- * @(#)umap_vnops.c       1.5 (Berkeley) 7/10/92
+ *     @(#)umap_vnops.c        1.3 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -25,7 +23,7 @@
 #include <sys/namei.h>
 #include <sys/malloc.h>
 #include <sys/buf.h>
 #include <sys/namei.h>
 #include <sys/malloc.h>
 #include <sys/buf.h>

-#include <umapfs/umap.h>
+#include <miscfs/umapfs/umap.h>

 
 
 int umap_bug_bypass = 0;   /* for debugging: enables bypass printf'ing */
 
 
 int umap_bug_bypass = 0;   /* for debugging: enables bypass printf'ing */


@@ -36,7 +34,10 @@ int umap_bug_bypass = 0;   /* for debugging: enables bypass printf'ing */
  */ 
 int
 umap_bypass(ap)
  */ 
 int
 umap_bypass(ap)

-       struct vop_generic_args *ap;
+       struct vop_generic_args /* {
+               struct vnodeop_desc *a_desc;
+               <other random data follows, presumably>
+       } */ *ap;

 {
        extern int (**umap_vnodeop_p)();  /* not extern, really "forward" */
        int *mapdata, nentries ;
 {
        extern int (**umap_vnodeop_p)();  /* not extern, really "forward" */
        int *mapdata, nentries ;


@@ -225,7 +226,12 @@ umap_bypass(ap)
  */
 int
 umap_getattr(ap)
  */
 int
 umap_getattr(ap)

-       struct vop_getattr_args *ap;
+       struct vop_getattr_args /* {
+               struct vnode *a_vp;
+               struct vattr *a_vap;
+               struct ucred *a_cred;
+               struct proc *a_p;
+       } */ *ap;

 {
        short uid, gid;
        int error, tmpid, *mapdata, nentries, *gmapdata, gnentries;
 {
        short uid, gid;
        int error, tmpid, *mapdata, nentries, *gmapdata, gnentries;


@@ -233,7 +239,7 @@ umap_getattr(ap)
        struct vnodeop_desc *descp = ap->a_desc;
 
        if (error = umap_bypass(ap))
        struct vnodeop_desc *descp = ap->a_desc;
 
        if (error = umap_bypass(ap))

-               return error;
+               return (error);

        /* Requires that arguments be restored. */
        ap->a_vap->va_fsid = ap->a_vp->v_mount->mnt_stat.f_fsid.val[0];
 
        /* Requires that arguments be restored. */
        ap->a_vap->va_fsid = ap->a_vp->v_mount->mnt_stat.f_fsid.val[0];
 


@@ -287,12 +293,14 @@ umap_getattr(ap)
        } else
                ap->a_vap->va_gid = (gid_t)NULLGROUP;
        
        } else
                ap->a_vap->va_gid = (gid_t)NULLGROUP;
        

-       return 0;
+       return (0);

 }
 
 int
 }
 
 int

-umap_inactive (ap)
-       struct vop_inactive_args *ap;
+umap_inactive(ap)
+       struct vop_inactive_args /* {
+               struct vnode *a_vp;
+       } */ *ap;

 {
        /*
         * Do nothing (and _don't_ bypass).
 {
        /*
         * Do nothing (and _don't_ bypass).


@@ -301,12 +309,14 @@ umap_inactive (ap)
         * cache and reusable.
         *
         */
         * cache and reusable.
         *
         */

-       return 0;
+       return (0);

 }
 
 int
 }
 
 int

-umap_reclaim (ap)
-       struct vop_reclaim_args *ap;
+umap_reclaim(ap)
+       struct vop_reclaim_args /* {
+               struct vnode *a_vp;
+       } */ *ap;

 {
        struct vnode *vp = ap->a_vp;
        struct umap_node *xp = VTOUMAP(vp);
 {
        struct vnode *vp = ap->a_vp;
        struct umap_node *xp = VTOUMAP(vp);


@@ -318,12 +328,14 @@ umap_reclaim (ap)
        FREE(vp->v_data, M_TEMP);
        vp->v_data = NULL;
        vrele (lowervp);
        FREE(vp->v_data, M_TEMP);
        vp->v_data = NULL;
        vrele (lowervp);

-       return 0;
+       return (0);

 }
 
 int
 }
 
 int

-umap_strategy (ap)
-       struct vop_strategy_args *ap;
+umap_strategy(ap)
+       struct vop_strategy_args /* {
+               struct buf *a_bp;
+       } */ *ap;

 {
        struct buf *bp = ap->a_bp;
        int error;
 {
        struct buf *bp = ap->a_bp;
        int error;


@@ -336,12 +348,14 @@ umap_strategy (ap)
 
        bp->b_vp = savedvp;
 
 
        bp->b_vp = savedvp;
 

-       return error;
+       return (error);

 }
 
 int
 }
 
 int

-umap_bwrite (ap)
-       struct vop_bwrite_args *ap;
+umap_bwrite(ap)
+       struct vop_bwrite_args /* {
+               struct buf *a_bp;
+       } */ *ap;

 {
        struct buf *bp = ap->a_bp;
        int error;
 {
        struct buf *bp = ap->a_bp;
        int error;


@@ -354,22 +368,31 @@ umap_bwrite (ap)
 
        bp->b_vp = savedvp;
 
 
        bp->b_vp = savedvp;
 

-       return error;
+       return (error);

 }
 
 
 int
 }
 
 
 int

-umap_print (ap)
-       struct vop_print_args *ap;
+umap_print(ap)
+       struct vop_print_args /* {
+               struct vnode *a_vp;
+       } */ *ap;

 {
        register struct vnode *vp = ap->a_vp;
        printf ("\ttag VT_UMAPFS, vp=%x, lowervp=%x\n", vp, UMAPVPTOLOWERVP(vp));
 {
        register struct vnode *vp = ap->a_vp;
        printf ("\ttag VT_UMAPFS, vp=%x, lowervp=%x\n", vp, UMAPVPTOLOWERVP(vp));

-       return 0;
+       return (0);

 }
 
 int
 umap_rename(ap)
 }
 
 int
 umap_rename(ap)

-       struct vop_rename_args *ap;
+       struct vop_rename_args  /* {
+               struct vnode *a_fdvp;
+               struct vnode *a_fvp;
+               struct componentname *a_fcnp;
+               struct vnode *a_tdvp;
+               struct vnode *a_tvp;
+               struct componentname *a_tcnp;
+       } */ *ap;

 {
        int error;
        struct componentname *compnamep;
 {
        int error;
        struct componentname *compnamep;


@@ -400,7 +423,7 @@ umap_rename(ap)
                    compcredp->cr_uid,compcredp->cr_gid);
 
        if (error = umap_bypass(ap))
                    compcredp->cr_uid,compcredp->cr_gid);
 
        if (error = umap_bypass(ap))

-               return error;
+               return (error);

        
        /* Restore the additional mapped componentname cred structure. */
 
        
        /* Restore the additional mapped componentname cred structure. */