21 files changed, 120 insertions, 120 deletions
diff --git a/sys/miscfs/devfs/devfs_back.c b/sys/miscfs/devfs/devfs_back.c
index a12990a..5e615cb 100644
--- a/sys/miscfs/devfs/devfs_back.c
+++ b/sys/miscfs/devfs/devfs_back.c
@@ -2,7 +2,7 @@
 /*
  *  Written by Julian Elischer (julian@DIALix.oz.au)
  *
- *	$Header: /sys/miscfs/devfs/RCS/devfs_back.c,v 1.3 1995/01/07 04:20:25 root Exp root $
+ *	$Header: /home/ncvs/src/sys/miscfs/devfs/devfs_back.c,v 1.2 1995/04/20 07:34:51 julian Exp $
  */
 
 #include "param.h"
@@ -25,7 +25,7 @@ int	devfs_set_up = 0;	/* note tha we HAVE set up the backing tree */
 
 /*
  * Set up the root directory node in the backing plane
- * This is happenning before the vfs system has been 
+ * This is happenning before the vfs system has been
  * set up yet, so be careful about what we reference..
  * Notice that the ops are by indirection.. as they haven't
  * been set up yet!
@@ -35,7 +35,7 @@ void  devfs_back_init() /*proto*/
 
 	devnm_p devbp;
 	dn_p dnp;
-	/* 
+	/*
 	 * This may be called several times.. only do it if it needs
 	 * to be done.
 	 */
@@ -61,7 +61,7 @@ void  devfs_back_init() /*proto*/
 		}
 		bzero(dnp,sizeof(devnode_t));
 		/*
-		 * Link the two together 
+		 * Link the two together
 		 */
 		devbp->dnp = dnp;
 		dnp->links = 1;
@@ -81,7 +81,7 @@ void  devfs_back_init() /*proto*/
 		dnp->by.Dir.dirlast =
 				&dnp->by.Dir.dirlist;
 		dnp->by.Dir.myname = devbp;
-		/* 
+		/*
 		 * set up a pointer to directory type ops
 		 */
 		dnp->ops = &devfs_vnodeop_p;
@@ -92,7 +92,7 @@ void  devfs_back_init() /*proto*/
 		TIMEVAL_TO_TIMESPEC(&time,&(dnp->ctime))
 		dnp->mtime = dnp->ctime;
 		dnp->atime = dnp->ctime;
-		
+
 		/*
 		 * and the list of layers
 		 */
@@ -132,8 +132,8 @@ int	dev_finddir(char *orig_path, dn_p dirnode, int create, dn_p *dn_pp) /*proto*
 	char	*name;
 	register char *cp;
 	int	retval;
-	
-	
+
+
 	DBPRINT(("dev_finddir\n"));
 	devfs_back_init();		/* in case we are the first */
 	if(!dirnode) dirnode = dev_root->dnp;
@@ -242,7 +242,7 @@ int	dev_add_node(char *name, dn_p dirnode, int entrytype, union typeinfo *by, de
 	dnp->links = 1; /* implicit from our own name-node */
 
 	/*
-	 * note the node type we are adding 
+	 * note the node type we are adding
 	 * and set the creation times to NOW
 	 * put in it's name
 	 * include the implicit link in the count of links to the devnode..
@@ -294,7 +294,7 @@ int	dev_add_node(char *name, dn_p dirnode, int entrytype, union typeinfo *by, de
 		 * Make sure it has DEVICE type ops
 		 * and device specific fields are correct
 		 */
-		dnp->ops = &dev_spec_vnodeop_p; 
+		dnp->ops = &dev_spec_vnodeop_p;
 		dnp->by.Bdev.bdevsw = by->Bdev.bdevsw;
 		dnp->by.Bdev.dev = by->Bdev.dev;
 		break;
@@ -308,7 +308,7 @@ int	dev_add_node(char *name, dn_p dirnode, int entrytype, union typeinfo *by, de
 		dnp->by.Cdev.dev = by->Cdev.dev;
 		break;
 	case DEV_DDEV:
-		/* 
+		/*
 		 * store the address of (the address of) the ops
 		 * and the magic cookie to use with them
 		 */
@@ -389,7 +389,7 @@ int	dev_remove(devnm_p devbp) /*proto*/
 	 */
 	devfs_dn_free(devbp->dnp);
 	free (devbp, M_DEVFSBACK);
-	return 0; 
+	return 0;
 }
 
 int	dev_touch(devnm_p key)		/* update the node for this dev */ /*proto*/
@@ -421,7 +421,7 @@ void	devfs_dn_free(dn_p dnp) /*proto*/
 int get_cdev_major_num(caddr_t addr)	/*proto*/
 {
 	int	index = 0;
-	
+
 	DBPRINT(("get_cdev_major_num\n"));
 	while (index < nchrdev)
 	{
@@ -439,7 +439,7 @@ int get_cdev_major_num(caddr_t addr)	/*proto*/
 int get_bdev_major_num(caddr_t addr)	/*proto*/
 {
 	int	index = 0;
-	
+
 	DBPRINT(("get_bdev_major_num\n"));
 	while (index < nblkdev)
 	{
diff --git a/sys/miscfs/devfs/devfs_front.c b/sys/miscfs/devfs/devfs_front.c
index 14bf104..a3d0255 100644
--- a/sys/miscfs/devfs/devfs_front.c
+++ b/sys/miscfs/devfs/devfs_front.c
@@ -1,7 +1,7 @@
 /*
  * Written by Julian Elischer (julian@DIALix.oz.au)
  *
- *	$Header: /home/ncvs/src/sys/miscfs/devfs/devfs_front.c,v 1.2 1995/04/20 07:34:52 julian Exp $
+ *	$Header: /home/ncvs/src/sys/miscfs/devfs/devfs_front.c,v 1.3 1995/04/20 07:42:41 julian Exp $
  *
  */
 
@@ -52,7 +52,7 @@ int devfs_add_fronts(devnm_p parent,devnm_p child) /*proto*/
 				child->name);
 			continue;
 		}
-		
+
 	}
 	return(0);	/* for now always succeed */
 }
@@ -201,14 +201,14 @@ int dev_mk_front(dn_p parent,devnm_p back,devnm_p *devnm_pp , struct devfsmount
 	/*
 	 * not accounted for in the link counts..
 	 * only used to get from the front name entries
-	 * to the total length of the names 
+	 * to the total length of the names
 	 * which is stored in the parent's devnode
 	 */
  	newfp->parent = parent; /* is NULL for root */
 	/*******************************************************\
 	* Put it in the appropriate back/front list too.	*
 	\*******************************************************/
-	newfp->next_front = *back->prev_frontp; 
+	newfp->next_front = *back->prev_frontp;
 	newfp->prev_frontp = back->prev_frontp;
 	*back->prev_frontp = newfp;
 	back->prev_frontp = &(newfp->next_front);
@@ -237,7 +237,7 @@ int dev_mk_front(dn_p parent,devnm_p back,devnm_p *devnm_pp , struct devfsmount
 
 /*
  * duplicate the backing tree into a tree of nodes hung off the
- * mount point given as the argument. Do this by 
+ * mount point given as the argument. Do this by
  * calling dev_mk_front() which recurses all the way
  * up the tree..
  */
@@ -293,7 +293,7 @@ void dev_free_front(devnm_p devfp) /*proto*/
 		{
 			dev_free_front(devfp->dnp->by.Dir.dirlist);
 		}
-		/* 
+		/*
 		 * drop the reference counts on our and our parent's
 		 * nodes for "." and ".." (root has ".." -> "." )
 		 */
@@ -319,7 +319,7 @@ void dev_free_front(devnm_p devfp) /*proto*/
 	}
 	/*
 	 * If the node has a backing pointer we need to free ourselves
-	 * from that.. 
+	 * from that..
 	 * Remember that we may not HAVE a backing node.
 	 */
 	if (back = devfp->as.front.realthing) /* yes an assign */
diff --git a/sys/miscfs/devfs/devfs_vfsops.c b/sys/miscfs/devfs/devfs_vfsops.c
index 96c34f44..5781df7 100644
--- a/sys/miscfs/devfs/devfs_vfsops.c
+++ b/sys/miscfs/devfs/devfs_vfsops.c
@@ -1,7 +1,7 @@
 /*
  *  Written by Julian Elischer (julian@DIALix.oz.au)
  *
- *	$Header: /sys/miscfs/devfs/RCS/devfs_vfsops.c,v 1.4 1995/01/07 04:20:25 root Exp root $
+ *	$Header: /home/ncvs/src/sys/miscfs/devfs/devfs_vfsops.c,v 1.2 1995/04/20 07:34:53 julian Exp $
  *
  *
  */
@@ -26,7 +26,7 @@ int devfs_init(void) /*proto*/
 	devfs_back_init();
 	/* devfs_front_init();*/ /* nothing to do at the moment */
 	return 0; /*XXX*/
-} 
+}
 
 /*
  *  mp	 - pointer to 'mount' structure
diff --git a/sys/miscfs/devfs/devfs_vnops.c b/sys/miscfs/devfs/devfs_vnops.c
index 079ebd5..5deda3e 100644
--- a/sys/miscfs/devfs/devfs_vnops.c
+++ b/sys/miscfs/devfs/devfs_vnops.c
@@ -1,7 +1,7 @@
 /*
  *  Written by Julian Elischer (julian@DIALix.oz.au)
  *
- *	$Header: /home/ncvs/src/sys/miscfs/devfs/devfs_vnops.c,v 1.3 1995/04/20 22:00:05 julian Exp $
+ *	$Header: /home/ncvs/src/sys/miscfs/devfs/devfs_vnops.c,v 1.4 1995/05/03 23:04:26 julian Exp $
  *
  * symlinks can wait 'til later.
  */
@@ -187,7 +187,7 @@ DBPRINT(("errr, maybe not cached "));
 /* notfound: */
 /*XXX*/ /* possibly release some resources here */
 	/*
-	 * If creating, and at end of pathname 
+	 * If creating, and at end of pathname
 	 * then can consider
 	 * allowing file to be created.
 	 * XXX original code (ufs_lookup) checked for . being deleted
@@ -222,7 +222,7 @@ DBPRINT(("MKACCESS "));
 		if (!lockparent)
 			VOP_UNLOCK(dir_vnode);
 		/* DON't make a cache entry... status changing */
-		return (EJUSTRETURN); 
+		return (EJUSTRETURN);
 	}
 	/*
 	 * Insert name into cache (as non-existent) if appropriate.
@@ -345,7 +345,7 @@ found:
 	/*
 	 * Insert name into cache if appropriate.
 	 */
-	if (cnp->cn_flags & MAKEENTRY) 
+	if (cnp->cn_flags & MAKEENTRY)
 		cache_enter(dir_vnode, *result_vnode, cnp);
 DBPRINT(("GOT\n"));
 	return (0);
@@ -640,7 +640,7 @@ DBPRINT(("setattr\n"));
 		file_node->mode |= vap->va_mode & 07777;
 	}
 
-	if (vap->va_uid != (uid_t)VNOVAL) 
+	if (vap->va_uid != (uid_t)VNOVAL)
 	{
 		file_node->uid = vap->va_uid;
 	}
@@ -1038,7 +1038,7 @@ DBPRINT(("islocked\n"));
 	return 0;
 }
 
-int devfs_bmap(ap)                                                                  
+int devfs_bmap(ap)
         struct vop_bmap_args /* {
                 struct vnode *a_vp;
                 daddr_t  a_bn;
@@ -1080,7 +1080,7 @@ DBPRINT(("advlock\n"));
 }
 
 int	devfs_reclaim(ap)
-        struct vop_reclaim_args /* { 
+        struct vop_reclaim_args /* {
 		struct vnode *a_vp;
         } */ *ap;
 {
@@ -1094,7 +1094,7 @@ DBPRINT(("reclaim\n"));
 		return error;
 	}
 
-	file_node->vn = 0; 
+	file_node->vn = 0;
 	file_node->vn_id = 0;
 	return(0);
 }
diff --git a/sys/miscfs/devfs/devfsdefs.h b/sys/miscfs/devfs/devfsdefs.h
index a2f6d40..c6216e2 100644
--- a/sys/miscfs/devfs/devfsdefs.h
+++ b/sys/miscfs/devfs/devfsdefs.h
@@ -7,7 +7,7 @@
 /*
  * Written by Julian Elischer (julian@DIALIX.oz.au)
  *
- * $Header: /home/ncvs/src/sys/miscfs/devfs/devfsdefs.h,v 1.2 1995/04/20 07:34:55 julian Exp $
+ * $Header: /home/ncvs/src/sys/miscfs/devfs/devfsdefs.h,v 1.3 1995/05/03 23:06:31 julian Exp $
  */
 
 /* first a couple of defines for compatibility with inodes */
@@ -107,7 +107,7 @@ struct	devnode	/* the equivalent of an INODE */
 			dn_p	parent;
 			devnm_p	myname;
 			int	entrycount;
-		}Dir;	
+		}Dir;
 		struct {
 			char	*name;	/* must be allocated separatly */
 			int	namelen;
diff --git a/sys/miscfs/fdesc/fdesc_vnops.c b/sys/miscfs/fdesc/fdesc_vnops.c
index 6c20b26..420320a 100644
--- a/sys/miscfs/fdesc/fdesc_vnops.c
+++ b/sys/miscfs/fdesc/fdesc_vnops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)fdesc_vnops.c	8.9 (Berkeley) 1/21/94
  *
- * $Id: fdesc_vnops.c,v 1.7 1994/10/06 21:06:42 davidg Exp $
+ * $Id: fdesc_vnops.c,v 1.8 1995/03/28 07:56:44 bde Exp $
  */
 
 /*
@@ -138,7 +138,7 @@ loop:
 	/*
 	 * otherwise lock the array while we call getnewvnode
 	 * since that can block.
-	 */ 
+	 */
 	if (fdcache_lock & FDL_LOCKED) {
 		fdcache_lock |= FDL_WANT;
 		(void) tsleep((caddr_t) &fdcache_lock, PINOD, "fdalvp", 0);
@@ -195,7 +195,7 @@ fdesc_lookup(ap)
 	pname = ap->a_cnp->cn_nameptr;
 	if (ap->a_cnp->cn_namelen == 1 && *pname == '.') {
 		*vpp = dvp;
-		VREF(dvp);	
+		VREF(dvp);
 		VOP_LOCK(dvp);
 		return (0);
 	}
@@ -325,7 +325,7 @@ fdesc_open(ap)
 	case Fdesc:
 		/*
 		 * XXX Kludge: set p->p_dupfd to contain the value of the
-		 * the file descriptor being sought for duplication. The error 
+		 * the file descriptor being sought for duplication. The error
 		 * return ensures that the vnode for this device will be
 		 * released by vn_open. Open will detect this special error and
 		 * take the actions in dupfdopen.  Other callers of vn_open or
@@ -467,7 +467,7 @@ fdesc_getattr(ap)
 
 	default:
 		panic("fdesc_getattr");
-		break;	
+		break;
 	}
 
 	if (error == 0)
@@ -586,7 +586,7 @@ fdesc_readdir(ap)
 				break;
 			}
 			i++;
-			
+
 			switch (dt->d_fileno) {
 			case FD_CTTY:
 				if (cttyvp(uio->uio_procp) == NULL)
@@ -690,7 +690,7 @@ fdesc_read(ap)
 		error = EOPNOTSUPP;
 		break;
 	}
-	
+
 	return (error);
 }
 
@@ -714,7 +714,7 @@ fdesc_write(ap)
 		error = EOPNOTSUPP;
 		break;
 	}
-	
+
 	return (error);
 }
 
@@ -741,7 +741,7 @@ fdesc_ioctl(ap)
 		error = EOPNOTSUPP;
 		break;
 	}
-	
+
 	return (error);
 }
 
@@ -766,7 +766,7 @@ fdesc_select(ap)
 		error = EOPNOTSUPP;
 		break;
 	}
-	
+
 	return (error);
 }
 
diff --git a/sys/miscfs/fifofs/fifo_vnops.c b/sys/miscfs/fifofs/fifo_vnops.c
index bf1ec82..106ac89 100644
--- a/sys/miscfs/fifofs/fifo_vnops.c
+++ b/sys/miscfs/fifofs/fifo_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fifo_vnops.c	8.2 (Berkeley) 1/4/94
- * $Id: fifo_vnops.c,v 1.7 1995/02/03 06:46:13 davidg Exp $
+ * $Id: fifo_vnops.c,v 1.8 1995/03/16 18:13:13 bde Exp $
  */
 
 #include <sys/param.h>
@@ -124,7 +124,7 @@ fifo_lookup(ap)
 		struct componentname * a_cnp;
 	} */ *ap;
 {
-	
+
 	*ap->a_vpp = NULL;
 	return (ENOTDIR);
 }
@@ -169,7 +169,7 @@ fifo_open(ap)
 			return (error);
 		}
 		fip->fi_writesock = wso;
-		error = unp_connect2(wso, rso); 
+		error = unp_connect2(wso, rso);
 		if (error) {
 			(void)soclose(wso);
 			(void)soclose(rso);
@@ -251,7 +251,7 @@ fifo_read(ap)
 		rso->so_state |= SS_NBIO;
 	startresid = uio->uio_resid;
 	VOP_UNLOCK(ap->a_vp);
-	error = soreceive(rso, (struct mbuf **)0, uio, 
+	error = soreceive(rso, (struct mbuf **)0, uio,
 		(struct mbuf **)0, (struct mbuf **)0, (int*)0);
 	VOP_LOCK(ap->a_vp);
 	/*
diff --git a/sys/miscfs/nullfs/null_vfsops.c b/sys/miscfs/nullfs/null_vfsops.c
index 9b7e9da..eb1a192 100644
--- a/sys/miscfs/nullfs/null_vfsops.c
+++ b/sys/miscfs/nullfs/null_vfsops.c
@@ -36,7 +36,7 @@
  *	@(#)null_vfsops.c	8.2 (Berkeley) 1/21/94
  *
  * @(#)lofs_vfsops.c	1.2 (Berkeley) 6/18/92
- * $Id: null_vfsops.c,v 1.5 1995/03/16 18:13:31 bde Exp $
+ * $Id: null_vfsops.c,v 1.6 1995/03/16 20:23:39 wollman Exp $
  */
 
 /*
@@ -149,7 +149,7 @@ nullfs_mount(mp, path, data, ndp, p)
 
 	(void) copyinstr(path, mp->mnt_stat.f_mntonname, MNAMELEN - 1, &size);
 	bzero(mp->mnt_stat.f_mntonname + size, MNAMELEN - size);
-	(void) copyinstr(args.target, mp->mnt_stat.f_mntfromname, MNAMELEN - 1, 
+	(void) copyinstr(args.target, mp->mnt_stat.f_mntfromname, MNAMELEN - 1,
 	    &size);
 	bzero(mp->mnt_stat.f_mntfromname + size, MNAMELEN - size);
 #ifdef NULLFS_DIAGNOSTIC
@@ -204,7 +204,7 @@ nullfs_unmount(mp, mntflags, p)
 	 * moment, but who knows...
 	 */
 #if 0
-	mntflushbuf(mp, 0); 
+	mntflushbuf(mp, 0);
 	if (mntinvalbuf(mp, 1))
 		return (EBUSY);
 #endif
@@ -216,7 +216,7 @@ nullfs_unmount(mp, mntflags, p)
 
 #ifdef NULLFS_DIAGNOSTIC
 	vprint("alias root of lower", nullm_rootvp);
-#endif	 
+#endif
 	/*
 	 * Release reference on underlying root vnode
 	 */
@@ -327,7 +327,7 @@ nullfs_vget(mp, ino, vpp)
 	ino_t ino;
 	struct vnode **vpp;
 {
-	
+
 	return VFS_VGET(MOUNTTONULLMOUNT(mp)->nullm_vfs, ino, vpp);
 }
 
diff --git a/sys/miscfs/nullfs/null_vnops.c b/sys/miscfs/nullfs/null_vnops.c
index 9136baf..464d15a 100644
--- a/sys/miscfs/nullfs/null_vnops.c
+++ b/sys/miscfs/nullfs/null_vnops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)null_vnops.c	8.1 (Berkeley) 6/10/93
  *
- * $Id: null_vnops.c,v 1.6 1994/10/10 07:55:29 phk Exp $
+ * $Id: null_vnops.c,v 1.7 1995/03/19 14:28:54 davidg Exp $
  */
 
 /*
@@ -88,7 +88,7 @@
  * in the arguments and, if a vnode is return by the operation,
  * stacks a null-node on top of the returned vnode.
  *
- * Although bypass handles most operations, 
+ * Although bypass handles most operations,
  * vop_getattr, _inactive, _reclaim, and _print are not bypassed.
  * Vop_getattr must change the fsid being returned.
  * Vop_inactive and vop_reclaim are not bypassed so that
@@ -109,7 +109,7 @@
  * this or other null vnode stacks.
  *
  * New vnode stacks come into existance as a result of
- * an operation which returns a vnode.  
+ * an operation which returns a vnode.
  * The bypass routine stacks a null-node above the new
  * vnode before returning it to the caller.
  *
@@ -119,7 +119,7 @@
  * the root null-node (which was created when the null layer was mounted).
  * Now consider opening "sys".  A vop_lookup would be
  * done on the root null-node.  This operation would bypass through
- * to the lower layer which would return a vnode representing 
+ * to the lower layer which would return a vnode representing
  * the UFS "sys".  Null_bypass then builds a null-node
  * aliasing the UFS "sys" and returns this to the caller.
  * Later operations on the null-node "sys" will repeat this
@@ -133,13 +133,13 @@
  * then begin modifing the copy.  Sed can be used to easily rename
  * all variables.
  *
- * The umap layer is an example of a layer descended from the 
+ * The umap layer is an example of a layer descended from the
  * null layer.
  *
  *
  * INVOKING OPERATIONS ON LOWER LAYERS
  *
- * There are two techniques to invoke operations on a lower layer 
+ * There are two techniques to invoke operations on a lower layer
  * when the operation cannot be completely bypassed.  Each method
  * is appropriate in different situations.  In both cases,
  * it is the responsibility of the aliasing layer to make
@@ -200,7 +200,7 @@ int null_bug_bypass = 0;   /* for debugging: enables bypass printf'ing */
  *   to determine what implementation of the op should be invoked
  * - all mapped vnodes are of our vnode-type (NEEDSWORK:
  *   problems on rmdir'ing mount points and renaming?)
- */ 
+ */
 int
 null_bypass(ap)
 	struct vop_generic_args /* {
@@ -237,7 +237,7 @@ null_bypass(ap)
 	for (i = 0; i < VDESC_MAX_VPS; reles >>= 1, i++) {
 		if (descp->vdesc_vp_offsets[i] == VDESC_NO_OFFSET)
 			break;   /* bail out at end of list */
-		vps_p[i] = this_vp_p = 
+		vps_p[i] = this_vp_p =
 			VOPARG_OFFSETTO(struct vnode**,descp->vdesc_vp_offsets[i],ap);
 		/*
 		 * We're not guaranteed that any but the first vnode
@@ -257,7 +257,7 @@ null_bypass(ap)
 			if (reles & 1)
 				VREF(*this_vp_p);
 		}
-			
+
 	}
 
 	/*
diff --git a/sys/miscfs/portal/portal_vfsops.c b/sys/miscfs/portal/portal_vfsops.c
index 130f991..52c7bcf 100644
--- a/sys/miscfs/portal/portal_vfsops.c
+++ b/sys/miscfs/portal/portal_vfsops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)portal_vfsops.c	8.6 (Berkeley) 1/21/94
  *
- * $Id: portal_vfsops.c,v 1.6 1995/03/16 18:13:38 bde Exp $
+ * $Id: portal_vfsops.c,v 1.7 1995/03/16 20:23:41 wollman Exp $
  */
 
 /*
@@ -172,7 +172,7 @@ portal_unmount(mp, mntflags, p)
 	 * moment, but who knows...
 	 */
 #ifdef notyet
-	mntflushbuf(mp, 0); 
+	mntflushbuf(mp, 0);
 	if (mntinvalbuf(mp, 1))
 		return (EBUSY);
 #endif
diff --git a/sys/miscfs/portal/portal_vnops.c b/sys/miscfs/portal/portal_vnops.c
index 56f52fb..41fd2de 100644
--- a/sys/miscfs/portal/portal_vnops.c
+++ b/sys/miscfs/portal/portal_vnops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)portal_vnops.c	8.8 (Berkeley) 1/21/94
  *
- * $Id: portal_vnops.c,v 1.4 1994/09/21 03:47:05 wollman Exp $
+ * $Id: portal_vnops.c,v 1.5 1995/03/28 07:57:02 bde Exp $
  */
 
 /*
@@ -272,7 +272,7 @@ portal_open(ap)
 		error = so->so_error;
 		goto bad;
 	}
-		
+
 	/*
 	 * Set miscellaneous flags
 	 */
@@ -377,7 +377,7 @@ portal_open(ap)
 	}
 
 	/*
-	 * Check that the mode the file is being opened for is a subset 
+	 * Check that the mode the file is being opened for is a subset
 	 * of the mode of the existing descriptor.
 	 */
  	fp = p->p_fd->fd_ofiles[fd];
@@ -399,7 +399,7 @@ bad:;
 	/*
 	 * And discard the control message.
 	 */
-	if (cm) { 
+	if (cm) {
 		m_freem(cm);
 	}
 
diff --git a/sys/miscfs/procfs/procfs_mem.c b/sys/miscfs/procfs/procfs_mem.c
index f55e5e3..0f1b3b0 100644
--- a/sys/miscfs/procfs/procfs_mem.c
+++ b/sys/miscfs/procfs/procfs_mem.c
@@ -37,7 +37,7 @@
  *
  *	@(#)procfs_mem.c	8.4 (Berkeley) 1/21/94
  *
- *	$Id: procfs_mem.c,v 1.5 1994/10/18 04:40:41 davidg Exp $
+ *	$Id: procfs_mem.c,v 1.6 1995/01/05 03:59:38 davidg Exp $
  */
 
 /*
@@ -108,7 +108,7 @@ procfs_rwmem(p, uio)
 		 * The map we want...
 		 */
 		map = &p->p_vmspace->vm_map;
-  
+
 		/*
 		 * Check the permissions for the area we're interested
 		 * in.
@@ -148,7 +148,7 @@ procfs_rwmem(p, uio)
 		 */
 		if (!error)
 			vm_map_lookup_done(tmap, out_entry);
-  
+
 		/*
 		 * Fault the page in...
 		 */
diff --git a/sys/miscfs/procfs/procfs_status.c b/sys/miscfs/procfs/procfs_status.c
index c74cde9..f129022 100644
--- a/sys/miscfs/procfs/procfs_status.c
+++ b/sys/miscfs/procfs/procfs_status.c
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs_status.c	8.3 (Berkeley) 2/17/94
  *
- *	$Id: procfs_status.c,v 1.2 1994/08/02 07:45:20 davidg Exp $
+ *	$Id: procfs_status.c,v 1.3 1994/10/10 07:55:38 phk Exp $
  */
 
 #include <sys/param.h>
@@ -109,7 +109,7 @@ procfs_dostatus(curp, p, pfs, uio)
 			p->p_stats->p_start.tv_usec);
 	else
 		ps += sprintf(ps, " -1,-1");
-	
+
 	{
 		struct timeval ut, st;
 
diff --git a/sys/miscfs/procfs/procfs_subr.c b/sys/miscfs/procfs/procfs_subr.c
index e1cfdf3..6c464c1 100644
--- a/sys/miscfs/procfs/procfs_subr.c
+++ b/sys/miscfs/procfs/procfs_subr.c
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs_subr.c	8.4 (Berkeley) 1/27/94
  *
- *	$Id: procfs_subr.c,v 1.3 1994/10/06 21:06:44 davidg Exp $
+ *	$Id: procfs_subr.c,v 1.4 1995/04/15 02:30:12 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -103,7 +103,7 @@ loop:
 	/*
 	 * otherwise lock the vp list while we call getnewvnode
 	 * since that can block.
-	 */ 
+	 */
 	if (pfsvplock & PROCFS_LOCKED) {
 		pfsvplock |= PROCFS_WANT;
 		(void) tsleep((caddr_t) &pfsvplock, PINOD, "pfsavp", 0);
diff --git a/sys/miscfs/procfs/procfs_vnops.c b/sys/miscfs/procfs/procfs_vnops.c
index 8decad4..738df27 100644
--- a/sys/miscfs/procfs/procfs_vnops.c
+++ b/sys/miscfs/procfs/procfs_vnops.c
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs_vnops.c	8.6 (Berkeley) 2/7/94
  *
- *	$Id: procfs_vnops.c,v 1.12 1995/05/11 19:26:33 rgrimes Exp $
+ *	$Id: procfs_vnops.c,v 1.13 1995/05/25 01:35:24 davidg Exp $
  */
 
 /*
@@ -666,7 +666,7 @@ procfs_readdir(ap)
 				break;
 
 			dt = &procent[i];
-			
+
 			dp->d_reclen = UIO_MX;
 			dp->d_fileno = PROCFS_FILENO(pfs->pfs_pid, dt->d_pfstype);
 			dp->d_type = DT_REG;
diff --git a/sys/miscfs/umapfs/umap.h b/sys/miscfs/umapfs/umap.h
index 5903d30..5be2e5e 100644
--- a/sys/miscfs/umapfs/umap.h
+++ b/sys/miscfs/umapfs/umap.h
@@ -35,7 +35,7 @@
  *
  *	@(#)umap.h	8.3 (Berkeley) 1/21/94
  *
- * $Id$
+ * $Id: umap.h,v 1.2 1994/08/02 07:45:33 davidg Exp $
  */
 
 #define MAPFILEENTRIES 64
@@ -56,9 +56,9 @@ struct umap_mount {
 	struct vnode	*umapm_rootvp;	/* Reference to root umap_node */
 	int             info_nentries;  /* number of uid mappings */
 	int		info_gnentries;	/* number of gid mappings */
-	u_long		info_mapdata[MAPFILEENTRIES][2]; /* mapping data for 
+	u_long		info_mapdata[MAPFILEENTRIES][2]; /* mapping data for
 	    user mapping in ficus */
-	u_long		info_gmapdata[GMAPFILEENTRIES][2]; /*mapping data for 
+	u_long		info_gmapdata[GMAPFILEENTRIES][2]; /*mapping data for
 	    group mapping in ficus */
 };
 
diff --git a/sys/miscfs/umapfs/umap_subr.c b/sys/miscfs/umapfs/umap_subr.c
index 4b2aad4b..792f4a8 100644
--- a/sys/miscfs/umapfs/umap_subr.c
+++ b/sys/miscfs/umapfs/umap_subr.c
@@ -35,7 +35,7 @@
  *
  *	@(#)umap_subr.c	8.6 (Berkeley) 1/26/94
  *
- * $Id: umap_subr.c,v 1.2 1994/05/25 09:09:07 rgrimes Exp $
+ * $Id: umap_subr.c,v 1.3 1994/10/10 07:55:43 phk Exp $
  */
 
 #include <sys/param.h>
@@ -387,7 +387,7 @@ umap_mapids(v_mount, credp)
 		credp->cr_gid = NULLGROUP;
 #endif
 
-	/* Now we must map each of the set of groups in the cr_groups 
+	/* Now we must map each of the set of groups in the cr_groups
 		structure. */
 
 	i = 0;
diff --git a/sys/miscfs/umapfs/umap_vfsops.c b/sys/miscfs/umapfs/umap_vfsops.c
index a98ae18..64f05bb 100644
--- a/sys/miscfs/umapfs/umap_vfsops.c
+++ b/sys/miscfs/umapfs/umap_vfsops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)umap_vfsops.c	8.3 (Berkeley) 1/21/94
  *
- * $Id: umap_vfsops.c,v 1.6 1995/03/16 18:13:55 bde Exp $
+ * $Id: umap_vfsops.c,v 1.7 1995/03/16 20:23:43 wollman Exp $
  */
 
 /*
@@ -127,12 +127,12 @@ umapfs_mount(mp, path, data, ndp, p)
 	 */
 	amp->umapm_vfs = lowerrootvp->v_mount;
 
-	/* 
+	/*
 	 * Now copy in the number of entries and maps for umap mapping.
 	 */
 	amp->info_nentries = args.nentries;
 	amp->info_gnentries = args.gnentries;
-	error = copyin(args.mapdata, (caddr_t)amp->info_mapdata, 
+	error = copyin(args.mapdata, (caddr_t)amp->info_mapdata,
 	    2*sizeof(u_long)*args.nentries);
 	if (error)
 		return (error);
@@ -144,7 +144,7 @@ umapfs_mount(mp, path, data, ndp, p)
 	 	    amp->info_mapdata[i][1]);
 #endif
 
-	error = copyin(args.gmapdata, (caddr_t)amp->info_gmapdata, 
+	error = copyin(args.gmapdata, (caddr_t)amp->info_gmapdata,
 	    2*sizeof(u_long)*args.nentries);
 	if (error)
 		return (error);
@@ -152,7 +152,7 @@ umapfs_mount(mp, path, data, ndp, p)
 #ifdef UMAP_DIAGNOSTIC
 	printf("umap_mount:gnentries %d\n",args.gnentries);
 	for (i = 0; i < args.gnentries; i++)
-		printf("	group %d maps to %d\n", 
+		printf("	group %d maps to %d\n",
 		    amp->info_gmapdata[i][0],
 	 	    amp->info_gmapdata[i][1]);
 #endif
@@ -190,7 +190,7 @@ umapfs_mount(mp, path, data, ndp, p)
 
 	(void) copyinstr(path, mp->mnt_stat.f_mntonname, MNAMELEN - 1, &size);
 	bzero(mp->mnt_stat.f_mntonname + size, MNAMELEN - size);
-	(void) copyinstr(args.target, mp->mnt_stat.f_mntfromname, MNAMELEN - 1, 
+	(void) copyinstr(args.target, mp->mnt_stat.f_mntfromname, MNAMELEN - 1,
 	    &size);
 	bzero(mp->mnt_stat.f_mntfromname + size, MNAMELEN - size);
 #ifdef UMAPFS_DIAGNOSTIC
@@ -245,7 +245,7 @@ umapfs_unmount(mp, mntflags, p)
 	 * moment, but who knows...
 	 */
 #ifdef notyet
-	mntflushbuf(mp, 0); 
+	mntflushbuf(mp, 0);
 	if (mntinvalbuf(mp, 1))
 		return (EBUSY);
 #endif
@@ -257,7 +257,7 @@ umapfs_unmount(mp, mntflags, p)
 
 #ifdef UMAPFS_DIAGNOSTIC
 	vprint("alias root of lower", umapm_rootvp);
-#endif	 
+#endif
 	/*
 	 * Release reference on underlying root vnode
 	 */
@@ -368,7 +368,7 @@ umapfs_vget(mp, ino, vpp)
 	ino_t ino;
 	struct vnode **vpp;
 {
-	
+
 	return (VFS_VGET(MOUNTTOUMAPMOUNT(mp)->umapm_vfs, ino, vpp));
 }
 
diff --git a/sys/miscfs/umapfs/umap_vnops.c b/sys/miscfs/umapfs/umap_vnops.c
index 14d3fcc..a82d1c6 100644
--- a/sys/miscfs/umapfs/umap_vnops.c
+++ b/sys/miscfs/umapfs/umap_vnops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)umap_vnops.c	8.3 (Berkeley) 1/5/94
- * $Id: umap_vnops.c,v 1.7 1994/10/10 07:55:44 phk Exp $
+ * $Id: umap_vnops.c,v 1.8 1995/03/19 14:28:55 davidg Exp $
  */
 
 /*
@@ -59,7 +59,7 @@ int umap_bug_bypass = 0;   /* for debugging: enables bypass printf'ing */
 /*
  * This is the 10-Apr-92 bypass routine.
  * See null_vnops.c:null_bypass for more details.
- */ 
+ */
 int
 umap_bypass(ap)
 	struct vop_generic_args /* {
@@ -101,7 +101,7 @@ umap_bypass(ap)
 	for (i = 0; i < VDESC_MAX_VPS; reles >>= 1, i++) {
 		if (descp->vdesc_vp_offsets[i] == VDESC_NO_OFFSET)
 			break;   /* bail out at end of list */
-		vps_p[i] = this_vp_p = 
+		vps_p[i] = this_vp_p =
 			VOPARG_OFFSETTO(struct vnode**, descp->vdesc_vp_offsets[i], ap);
 
 		if (i == 0) {
@@ -122,7 +122,7 @@ umap_bypass(ap)
 			if (reles & 1)
 				VREF(*this_vp_p);
 		}
-			
+
 	}
 
 	/*
@@ -131,7 +131,7 @@ umap_bypass(ap)
 
 	if (descp->vdesc_cred_offset != VDESC_NO_OFFSET) {
 
-		credpp = VOPARG_OFFSETTO(struct ucred**, 
+		credpp = VOPARG_OFFSETTO(struct ucred**,
 		    descp->vdesc_cred_offset, ap);
 
 		/* Save old values */
@@ -141,7 +141,7 @@ umap_bypass(ap)
 		credp = *credpp;
 
 		if (umap_bug_bypass && credp->cr_uid != 0)
-			printf("umap_bypass: user was %ld, group %ld\n", 
+			printf("umap_bypass: user was %ld, group %ld\n",
 			    credp->cr_uid, credp->cr_gid);
 
 		/* Map all ids in the credential structure. */
@@ -149,17 +149,17 @@ umap_bypass(ap)
 		umap_mapids(vp1->v_mount, credp);
 
 		if (umap_bug_bypass && credp->cr_uid != 0)
-			printf("umap_bypass: user now %ld, group %ld\n", 
+			printf("umap_bypass: user now %ld, group %ld\n",
 			    credp->cr_uid, credp->cr_gid);
 	}
 
 	/* BSD often keeps a credential in the componentname structure
-	 * for speed.  If there is one, it better get mapped, too. 
+	 * for speed.  If there is one, it better get mapped, too.
 	 */
 
 	if (descp->vdesc_componentname_offset != VDESC_NO_OFFSET) {
 
-		compnamepp = VOPARG_OFFSETTO(struct componentname**, 
+		compnamepp = VOPARG_OFFSETTO(struct componentname**,
 		    descp->vdesc_componentname_offset, ap);
 
 		compcredp = (*compnamepp)->cn_cred;
@@ -167,7 +167,7 @@ umap_bypass(ap)
 		compcredp = (*compnamepp)->cn_cred = crdup(savecompcredp);
 
 		if (umap_bug_bypass && compcredp->cr_uid != 0)
-			printf("umap_bypass: component credit user was %ld, group %ld\n", 
+			printf("umap_bypass: component credit user was %ld, group %ld\n",
 			    compcredp->cr_uid, compcredp->cr_gid);
 
 		/* Map all ids in the credential structure. */
@@ -175,7 +175,7 @@ umap_bypass(ap)
 		umap_mapids(vp1->v_mount, compcredp);
 
 		if (umap_bug_bypass && compcredp->cr_uid != 0)
-			printf("umap_bypass: component credit user now %ld, group %ld\n", 
+			printf("umap_bypass: component credit user now %ld, group %ld\n",
 			    compcredp->cr_uid, compcredp->cr_gid);
 	}
 
@@ -217,7 +217,7 @@ umap_bypass(ap)
 	};
 
  out:
-	/* 
+	/*
 	 * Free duplicate cred structure and restore old one.
 	 */
 	if (descp->vdesc_cred_offset != VDESC_NO_OFFSET) {
@@ -228,19 +228,19 @@ umap_bypass(ap)
 		crfree(credp);
 		(*credpp) = savecredp;
 		if (umap_bug_bypass && credpp && (*credpp)->cr_uid != 0)
-		 	printf("umap_bypass: returning-user now %ld\n\n", 
+		 	printf("umap_bypass: returning-user now %ld\n\n",
 			    (*credpp)->cr_uid);
 	}
 
 	if (descp->vdesc_componentname_offset != VDESC_NO_OFFSET) {
 		if (umap_bug_bypass && compcredp && compcredp->cr_uid != 0)
-		printf("umap_bypass: returning-component-user was %ld\n", 
+		printf("umap_bypass: returning-component-user was %ld\n",
 				compcredp->cr_uid);
 
 		crfree(compcredp);
 		(*compnamepp)->cn_cred = savecompcredp;
 		if (umap_bug_bypass && credpp && (*credpp)->cr_uid != 0)
-		 	printf("umap_bypass: returning-component-user now %ld\n", 
+		 	printf("umap_bypass: returning-component-user now %ld\n",
 					compcredp->cr_uid);
 	}
 
@@ -288,7 +288,7 @@ umap_getattr(ap)
 	uid = ap->a_vap->va_uid;
 	gid = ap->a_vap->va_gid;
 	if (umap_bug_bypass)
-		printf("umap_getattr: mapped uid = %d, mapped gid = %d\n", uid, 
+		printf("umap_getattr: mapped uid = %d, mapped gid = %d\n", uid,
 		    gid);
 
 	vp1p = VOPARG_OFFSETTO(struct vnode**, descp->vdesc_vp_offsets[0], ap);
@@ -307,7 +307,7 @@ umap_getattr(ap)
 		ap->a_vap->va_uid = (uid_t) tmpid;
 		if (umap_bug_bypass)
 			printf("umap_getattr: original uid = %d\n", uid);
-	} else 
+	} else
 		ap->a_vap->va_uid = (uid_t) NOBODY;
 
 	/* Reverse map the gid for the vnode. */
@@ -321,7 +321,7 @@ umap_getattr(ap)
 			printf("umap_getattr: original gid = %d\n", gid);
 	} else
 		ap->a_vap->va_gid = (gid_t) NULLGROUP;
-	
+
 	return (0);
 }
 
@@ -350,7 +350,7 @@ umap_reclaim(ap)
 	struct vnode *vp = ap->a_vp;
 	struct umap_node *xp = VTOUMAP(vp);
 	struct vnode *lowervp = xp->umap_lowervp;
-	
+
 	/* After this assignment, this node will not be re-used. */
 	xp->umap_lowervp = NULL;
 	remque(xp);
@@ -442,7 +442,7 @@ umap_rename(ap)
 	compcredp = compnamep->cn_cred = crdup(savecompcredp);
 
 	if (umap_bug_bypass && compcredp->cr_uid != 0)
-		printf("umap_rename: rename component credit user was %ld, group %ld\n", 
+		printf("umap_rename: rename component credit user was %ld, group %ld\n",
 		    compcredp->cr_uid, compcredp->cr_gid);
 
 	/* Map all ids in the credential structure. */
@@ -450,11 +450,11 @@ umap_rename(ap)
 	umap_mapids(vp->v_mount, compcredp);
 
 	if (umap_bug_bypass && compcredp->cr_uid != 0)
-		printf("umap_rename: rename component credit user now %ld, group %ld\n", 
+		printf("umap_rename: rename component credit user now %ld, group %ld\n",
 		    compcredp->cr_uid, compcredp->cr_gid);
 
 	error = umap_bypass(ap);
-	
+
 	/* Restore the additional mapped componentname cred structure. */
 
 	crfree(compcredp);
diff --git a/sys/miscfs/union/union_subr.c b/sys/miscfs/union/union_subr.c
index 02f7a10..cbbd171 100644
--- a/sys/miscfs/union/union_subr.c
+++ b/sys/miscfs/union/union_subr.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_subr.c	8.4 (Berkeley) 2/17/94
- * $Id: union_subr.c,v 1.4 1994/10/06 21:06:48 davidg Exp $
+ * $Id: union_subr.c,v 1.5 1994/10/10 07:55:46 phk Exp $
  */
 
 #include <sys/param.h>
@@ -130,7 +130,7 @@ union_updatevp(un, uppervp, lowervp)
 
 		LIST_REMOVE(un, un_cache);
 		union_list_unlock(ohash);
-	} else {	
+	} else {
 		while (union_list_lock(nhash))
 			continue;
 	}
@@ -372,7 +372,7 @@ loop:
 	/*
 	 * otherwise lock the vp list while we call getnewvnode
 	 * since that can block.
-	 */ 
+	 */
 	hash = UNION_HASH(uppervp, lowervp);
 
 	if (union_list_lock(hash))
diff --git a/sys/miscfs/union/union_vfsops.c b/sys/miscfs/union/union_vfsops.c
index c9e2c60..670c7ce 100644
--- a/sys/miscfs/union/union_vfsops.c
+++ b/sys/miscfs/union/union_vfsops.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_vfsops.c	8.7 (Berkeley) 3/5/94
- * $Id: union_vfsops.c,v 1.8 1995/03/16 18:14:02 bde Exp $
+ * $Id: union_vfsops.c,v 1.9 1995/03/16 20:23:44 wollman Exp $
  */
 
 /*
@@ -118,7 +118,7 @@ union_mount(mp, path, data, ndp, p)
 	error = VOP_GETATTR(mp->mnt_vnodecovered, &va, cred, p);
 	if (error)
 		goto bad;
-	if ((va.va_uid != cred->cr_uid) && 
+	if ((va.va_uid != cred->cr_uid) &&
 	    (cred->cr_uid != 0)) {
 		error = EACCES;
 		goto bad;
@@ -163,7 +163,7 @@ union_mount(mp, path, data, ndp, p)
 		error = EINVAL;
 		goto bad;
 	}
-	
+
 	um = (struct union_mount *) malloc(sizeof(struct union_mount),
 				M_UFSMNT, M_WAITOK);	/* XXX */
 
@@ -338,7 +338,7 @@ union_unmount(mp, mntflags, p)
 
 #ifdef UNION_DIAGNOSTIC
 	vprint("alias root of lower", um_rootvp);
-#endif	 
+#endif
 	/*
 	 * Discard references to upper and lower target vnodes.
 	 */
@@ -517,7 +517,7 @@ union_vget(mp, ino, vpp)
 	ino_t ino;
 	struct vnode **vpp;
 {
-	
+
 	return (EOPNOTSUPP);
 }