Remove trailing whitespace.

35 files changed, 442 insertions, 442 deletions

diff --git a/sys/fs/cd9660/cd9660_lookup.c b/sys/fs/cd9660/cd9660_lookup.c
index 9ae15f60e472..e035ce03a23b 100644
--- a/sys/fs/cd9660/cd9660_lookup.c
+++ b/sys/fs/cd9660/cd9660_lookup.c
@@ -38,7 +38,7 @@
  *	from: @(#)ufs_lookup.c	7.33 (Berkeley) 5/19/91
  *
  *	@(#)cd9660_lookup.c	8.2 (Berkeley) 1/23/94
- * $Id: cd9660_lookup.c,v 1.5 1994/09/26 00:32:54 gpalmer Exp $
+ * $Id: cd9660_lookup.c,v 1.6 1995/01/16 17:03:23 joerg Exp $
  */
 
 #include <sys/param.h>
@@ -126,7 +126,7 @@ cd9660_lookup(ap)
 	struct ucred *cred = cnp->cn_cred;
 	int flags = cnp->cn_flags;
 	int nameiop = cnp->cn_nameiop;
-	
+
 	bp = NULL;
 	*vpp = NULL;
 	vdp = ap->a_dvp;
@@ -134,7 +134,7 @@ cd9660_lookup(ap)
 	imp = dp->i_mnt;
 	lockparent = flags & LOCKPARENT;
 	wantparent = flags & (LOCKPARENT|WANTPARENT);
-	
+
 	/*
 	 * Check accessiblity of directory.
 	 */
@@ -142,7 +142,7 @@ cd9660_lookup(ap)
 	    return (ENOTDIR);
 	if ((error = VOP_ACCESS(vdp, VEXEC, cred, cnp->cn_proc)))
 		return (error);
-	
+
 	/*
 	 * We now have a segment name to search for, and a directory to search.
 	 *
@@ -197,7 +197,7 @@ cd9660_lookup(ap)
 		vdp = ITOV(dp);
 		*vpp = NULL;
 	}
-	
+
 	len = cnp->cn_namelen;
 	name = cnp->cn_nameptr;
 	/*
@@ -208,7 +208,7 @@ cd9660_lookup(ap)
 		len--;
 		name++;
 	}
-	
+
 	/*
 	 * If there is cached information on a previous search of
 	 * this directory, pick up where we last left off.
@@ -236,7 +236,7 @@ cd9660_lookup(ap)
 		iso_nchstats.ncs_2passes++;
 	}
 	endsearch = roundup(dp->i_size, imp->logical_block_size);
-	
+
 searchloop:
 	while (dp->i_offset < endsearch) {
 		/*
@@ -256,7 +256,7 @@ searchloop:
 		 */
 		ep = (struct iso_directory_record *)
 			(bp->b_un.b_addr + entryoffsetinblock);
-		
+
 		reclen = isonum_711 (ep->length);
 		if (reclen == 0) {
 			/* skip to next block, if any */
@@ -264,26 +264,26 @@ searchloop:
 				roundup(dp->i_offset, imp->logical_block_size);
 			continue;
 		}
-		
+
 		if (reclen < ISO_DIRECTORY_RECORD_SIZE)
 			/* illegal entry, stop */
 			break;
-		
+
 		if (entryoffsetinblock + reclen > imp->logical_block_size)
 			/* entries are not allowed to cross boundaries */
 			break;
-		
+
 		/*
 		 * Check for a name match.
 		 */
 		namelen = isonum_711(ep->name_len);
 		isoflags = isonum_711(imp->iso_ftype == ISO_FTYPE_HIGH_SIERRA?
 				      &ep->date[6]: ep->flags);
-		
+
 		if (reclen < ISO_DIRECTORY_RECORD_SIZE + namelen)
 			/* illegal entry, stop */
 			break;
-		
+
 		switch (imp->iso_ftype) {
 		default:
 			if (!(isoflags & 4) == !assoc) {
@@ -375,13 +375,13 @@ notfound:
 	if (nameiop == CREATE || nameiop == RENAME)
 		return (EJUSTRETURN);
 	return (ENOENT);
-	
+
 found:
 	if (numdirpasses == 2)
 		iso_nchstats.ncs_pass2++;
 	if (bp != NULL)
 		brelse(bp);
-	
+
 	/*
 	 * Found component in pathname.
 	 * If the final component of path name, save information
@@ -389,7 +389,7 @@ found:
 	 */
 	if ((flags & ISLASTCN) && nameiop == LOOKUP)
 		dp->i_diroff = dp->i_offset;
-	
+
 	/*
 	 * Step through the translation in the name.  We do not `iput' the
 	 * directory because we may need it again if a symbolic link
@@ -435,7 +435,7 @@ found:
 			ISO_IUNLOCK(pdp);
 		*vpp = ITOV(tdp);
 	}
-	
+
 	/*
 	 * Insert name into cache if appropriate.
 	 */
@@ -461,13 +461,13 @@ iso_blkatoff(ip, offset, bpp)
 	int bsize = iso_blksize(imp,ip,lbn);
 	struct buf *bp;
 	int error;
-	
+
 	if ((error = bread(ITOV(ip),lbn,bsize,NOCRED,&bp))) {
 		brelse(bp);
 		*bpp = 0;
 		return (error);
 	}
 	*bpp = bp;
-	
+
 	return (0);
 }
diff --git a/sys/fs/cd9660/cd9660_node.c b/sys/fs/cd9660/cd9660_node.c
index a6292f3073c2..7b321a788274 100644
--- a/sys/fs/cd9660/cd9660_node.c
+++ b/sys/fs/cd9660/cd9660_node.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_node.c	8.2 (Berkeley) 1/23/94
- * $Id: cd9660_node.c,v 1.9 1995/02/21 18:41:30 bde Exp $
+ * $Id: cd9660_node.c,v 1.10 1995/03/16 18:12:15 bde Exp $
  */
 
 #include <sys/param.h>
@@ -117,7 +117,7 @@ iso_dmap(dev,ino,create)
 {
 	struct iso_dnode *dp;
 	union iso_dhead *dh;
-	
+
 	dh = &iso_dhead[DNOHASH(dev, ino)];
 	for (dp = dh->dh_chain[0];
 	     dp != (struct iso_dnode *)dh;
@@ -132,7 +132,7 @@ iso_dmap(dev,ino,create)
 	dp->i_dev = dev;
 	dp->i_number = ino;
 	insque(dp,dh);
-	
+
 	return dp;
 }
 
@@ -142,7 +142,7 @@ iso_dunmap(dev)
 {
 	struct iso_dnode *dp, *dq;
 	union iso_dhead *dh;
-	
+
 	for (dh = iso_dhead; dh < iso_dhead + DNOHSZ; dh++) {
 		for (dp = dh->dh_chain[0];
 		     dp != (struct iso_dnode *)dh;
@@ -184,7 +184,7 @@ iso_iget(xp, ino, relocated, ipp, isodir)
 	union iso_ihead *ih;
 	int error, result;
 	struct iso_mnt *imp;
-	
+
 	ih = &iso_ihead[INOHASH(dev, ino)];
 loop:
 	for (ip = ih->ih_chain[0];
@@ -218,7 +218,7 @@ loop:
 	ip->i_devvp = 0;
 	ip->i_diroff = 0;
 	ip->i_lockf = 0;
-	
+
 	/*
 	 * Put it onto its hash chain and lock it so that other requests for
 	 * this inode will block if they arrive while we are sleeping waiting
@@ -234,7 +234,7 @@ loop:
 	ip->i_mnt = imp;
 	ip->i_devvp = imp->im_devvp;
 	VREF(ip->i_devvp);
-	
+
 	if (relocated) {
 		/*
 		 * On relocated directories we must
@@ -252,13 +252,13 @@ loop:
 		}
 		isodir = (struct iso_directory_record *)bp->b_un.b_addr;
 	}
-	
+
 	ip->iso_extent = isonum_733(isodir->extent);
 	ip->i_size = isonum_733(isodir->size);
 	ip->iso_start = isonum_711(isodir->ext_attr_length) + ip->iso_extent;
-	
+
 	vp = ITOV(ip);
-	
+
 	/*
 	 * Setup time stamp, attribute
 	 */
@@ -280,12 +280,12 @@ loop:
 		brelse(bp2);
 	if (bp)
 		brelse(bp);
-	
+
 	/*
 	 * Initialize the associated vnode
 	 */
 	vp->v_type = IFTOVT(ip->inode.iso_mode);
-	
+
 	if ( vp->v_type == VFIFO ) {
 		vp->v_op = cd9660_fifoop_p;
 	} else if ( vp->v_type == VCHR || vp->v_type == VBLK ) {
@@ -321,10 +321,10 @@ loop:
 			ip = iq;
 		}
 	}
-	
+
 	if (ip->iso_extent == imp->root_extent)
 		vp->v_flag |= VROOT;
-	
+
 	*ipp = ip;
 	return 0;
 }
@@ -336,7 +336,7 @@ int
 iso_iput(ip)
 	register struct iso_node *ip;
 {
-	
+
 	if ((ip->i_flag & ILOCKED) == 0)
 		panic("iso_iput");
 	ISO_IUNLOCK(ip);
@@ -357,10 +357,10 @@ cd9660_inactive(ap)
 	struct vnode *vp = ap->a_vp;
 	register struct iso_node *ip = VTOI(vp);
 	int error = 0;
-	
+
 	if (prtactive && vp->v_usecount != 0)
 		vprint("cd9660_inactive: pushing active", vp);
-	
+
 	ip->i_flag = 0;
 	/*
 	 * If we are done with the inode, reclaim it
@@ -382,7 +382,7 @@ cd9660_reclaim(ap)
 {
 	register struct vnode *vp = ap->a_vp;
 	register struct iso_node *ip = VTOI(vp);
-	
+
 	if (prtactive && vp->v_usecount != 0)
 		vprint("cd9660_reclaim: pushing active", vp);
 	/*
@@ -411,7 +411,7 @@ int
 iso_ilock(ip)
 	register struct iso_node *ip;
 {
-	
+
 	while (ip->i_flag & ILOCKED) {
 		ip->i_flag |= IWANT;
 		if (ip->i_spare0 == curproc->p_pid)
@@ -458,7 +458,7 @@ cd9660_defattr(isodir,inop,bp,ftype)
 	struct iso_mnt *imp;
 	struct iso_extended_attributes *ap = NULL;
 	int off;
-	
+
 	/* high sierra does not have timezone data, flag is one byte ahead */
 	if (isonum_711(ftype == ISO_FTYPE_HIGH_SIERRA?
 		       &isodir->date[6]: isodir->flags)&2) {
@@ -480,7 +480,7 @@ cd9660_defattr(isodir,inop,bp,ftype)
 	}
 	if (bp) {
 		ap = (struct iso_extended_attributes *)bp->b_un.b_addr;
-		
+
 		if (isonum_711(ap->version) == 1) {
 			if (!(ap->perm[0]&0x40))
 				inop->inode.iso_mode |= VEXEC >> 6;
@@ -522,7 +522,7 @@ cd9660_deftstamp(isodir,inop,bp,ftype)
 	struct iso_mnt *imp;
 	struct iso_extended_attributes *ap = NULL;
 	int off;
-	
+
 	if (!bp
 	    && ((imp = inop->i_mnt)->im_flags&ISOFSMNT_EXTATT)
 	    && (off = isonum_711(isodir->ext_attr_length))) {
@@ -531,7 +531,7 @@ cd9660_deftstamp(isodir,inop,bp,ftype)
 	}
 	if (bp) {
 		ap = (struct iso_extended_attributes *)bp->b_un.b_addr;
-		
+
 		if (ftype != ISO_FTYPE_HIGH_SIERRA
 		    && isonum_711(ap->version) == 1) {
 			if (!cd9660_tstamp_conv17(ap->ftime,&inop->inode.iso_atime))
@@ -560,7 +560,7 @@ enum ISO_FTYPE ftype;
 {
 	int crtime, days;
 	int y, m, d, hour, minute, second, tz;
-	
+
 	y = pi[0] + 1900;
 	m = pi[1];
 	d = pi[2];
@@ -572,7 +572,7 @@ enum ISO_FTYPE ftype;
 	else
 		/* original high sierra misses timezone data */
 		tz = 0;
-	
+
 	if (y < 1970) {
 		pu->ts_sec  = 0;
 		pu->ts_nsec = 0;
@@ -590,7 +590,7 @@ enum ISO_FTYPE ftype;
 		days = 367*(y-1960)-7*(y+(m+9)/12)/4-3*((y+(m+9)/12-1)/100+1)/4+275*m/9+d-239;
 #endif
 		crtime = ((((days * 24) + hour) * 60 + minute) * 60) + second;
-		
+
 		/* timezone offset is unreliable on some disks */
 		if (-48 <= tz && tz <= 52)
 			crtime -= tz * 15 * 60;
@@ -606,7 +606,7 @@ cd9660_chars2ui(begin,len)
 	int len;
 {
 	unsigned rc;
-	
+
 	for (rc = 0; --len >= 0;) {
 		rc *= 10;
 		rc += *begin++ - '0';
@@ -620,28 +620,28 @@ cd9660_tstamp_conv17(pi,pu)
 	struct timespec *pu;
 {
 	unsigned char buf[7];
-	
+
 	/* year:"0001"-"9999" -> -1900	*/
 	buf[0] = cd9660_chars2ui(pi,4) - 1900;
-	
+
 	/* month: " 1"-"12"   -> 1 - 12 */
 	buf[1] = cd9660_chars2ui(pi + 4,2);
-	
+
 	/* day:	  " 1"-"31"   -> 1 - 31 */
 	buf[2] = cd9660_chars2ui(pi + 6,2);
-	
+
 	/* hour:  " 0"-"23"   -> 0 - 23 */
 	buf[3] = cd9660_chars2ui(pi + 8,2);
-	
+
 	/* minute:" 0"-"59"   -> 0 - 59 */
 	buf[4] = cd9660_chars2ui(pi + 10,2);
-	
+
 	/* second:" 0"-"59"   -> 0 - 59 */
 	buf[5] = cd9660_chars2ui(pi + 12,2);
-	
+
 	/* difference of GMT */
 	buf[6] = pi[16];
-	
+
 	return cd9660_tstamp_conv7(buf, pu, ISO_FTYPE_DEFAULT);
 }
 
diff --git a/sys/fs/cd9660/cd9660_rrip.c b/sys/fs/cd9660/cd9660_rrip.c
index 87767ea2d1c2..dca898301697 100644
--- a/sys/fs/cd9660/cd9660_rrip.c
+++ b/sys/fs/cd9660/cd9660_rrip.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_rrip.c	8.2 (Berkeley) 1/23/94
- * $Id: cd9660_rrip.c,v 1.5 1994/09/26 00:32:57 gpalmer Exp $
+ * $Id: cd9660_rrip.c,v 1.6 1995/01/16 17:03:26 joerg Exp $
  */
 
 #include <sys/param.h>
@@ -95,13 +95,13 @@ cd9660_rrip_slink(p,ana)
 	register ISO_RRIP_SLINK_COMPONENT *pcompe;
 	int len, wlen, cont;
 	char *outbuf, *inbuf;
-	
+
 	pcomp = (ISO_RRIP_SLINK_COMPONENT *)p->component;
 	pcompe = (ISO_RRIP_SLINK_COMPONENT *)((char *)p + isonum_711(p->h.length));
 	len = *ana->outlen;
 	outbuf = ana->outbuf;
 	cont = ana->cont;
-	
+
 	/*
 	 * Gathering a Symbolic name from each component with path
 	 */
@@ -109,7 +109,7 @@ cd9660_rrip_slink(p,ana)
 	     pcomp < pcompe;
 	     pcomp = (ISO_RRIP_SLINK_COMPONENT *)((char *)pcomp + ISO_RRIP_SLSIZ
 						  + isonum_711(pcomp->clen))) {
-		
+
 		if (!cont) {
 			if (len < ana->maxlen) {
 				len++;
@@ -117,29 +117,29 @@ cd9660_rrip_slink(p,ana)
 			}
 		}
 		cont = 0;
-		
+
 		inbuf = "..";
 		wlen = 0;
-		
+
 		switch (*pcomp->cflag) {
-			
+
 		case ISO_SUSP_CFLAG_CURRENT:
 			/* Inserting Current */
 			wlen = 1;
 			break;
-			
+
 		case ISO_SUSP_CFLAG_PARENT:
 			/* Inserting Parent */
 			wlen = 2;
 			break;
-			
+
 		case ISO_SUSP_CFLAG_ROOT:
 			/* Inserting slash for ROOT */
 			/* start over from beginning(?) */
 			outbuf -= len;
 			len = 0;
 			break;
-			
+
 		case ISO_SUSP_CFLAG_VOLROOT:
 			/* Inserting a mount point i.e. "/cdrom" */
 			/* same as above */
@@ -148,13 +148,13 @@ cd9660_rrip_slink(p,ana)
 			inbuf = ana->imp->im_mountp->mnt_stat.f_mntonname;
 			wlen = strlen(inbuf);
 			break;
-			
+
 		case ISO_SUSP_CFLAG_HOST:
 			/* Inserting hostname i.e. "kurt.tools.de" */
 			inbuf = hostname;
 			wlen = hostnamelen;
 			break;
-			
+
 		case ISO_SUSP_CFLAG_CONTINUE:
 			cont = 1;
 			/* fall thru */
@@ -168,7 +168,7 @@ cd9660_rrip_slink(p,ana)
 			wlen = ana->maxlen + 1;
 			break;
 		}
-		
+
 		if (len + wlen > ana->maxlen) {
 			/* indicate error to caller */
 			ana->cont = 1;
@@ -177,16 +177,16 @@ cd9660_rrip_slink(p,ana)
 			*ana->outlen = 0;
 			return 0;
 		}
-		
+
 		bcopy(inbuf,outbuf,wlen);
 		outbuf += wlen;
 		len += wlen;
-		
+
 	}
 	ana->outbuf = outbuf;
 	*ana->outlen = len;
 	ana->cont = cont;
-	
+
 	if (!isonum_711(p->flags)) {
 		ana->fields &= ~ISO_SUSP_SLINK;
 		return ISO_SUSP_SLINK;
@@ -205,28 +205,28 @@ cd9660_rrip_altname(p,ana)
 	char *inbuf;
 	int wlen;
 	int cont;
-	
+
 	inbuf = "..";
 	wlen = 0;
 	cont = 0;
-	
+
 	switch (*p->flags) {
 	case ISO_SUSP_CFLAG_CURRENT:
 		/* Inserting Current */
 		wlen = 1;
 		break;
-		
+
 	case ISO_SUSP_CFLAG_PARENT:
 		/* Inserting Parent */
 		wlen = 2;
 		break;
-		
+
 	case ISO_SUSP_CFLAG_HOST:
 		/* Inserting hostname i.e. "kurt.tools.de" */
 		inbuf = hostname;
 		wlen = hostnamelen;
 		break;
-		
+
 	case ISO_SUSP_CFLAG_CONTINUE:
 		cont = 1;
 		/* fall thru */
@@ -235,13 +235,13 @@ cd9660_rrip_altname(p,ana)
 		wlen = isonum_711(p->h.length) - 5;
 		inbuf = (char *)p + 5;
 		break;
-		
+
 	default:
 		printf("RRIP with incorrect NM flags?\n");
 		wlen = ana->maxlen + 1;
 		break;
 	}
-	
+
 	if ((*ana->outlen += wlen) > ana->maxlen) {
 		/* treat as no name field */
 		ana->fields &= ~ISO_SUSP_ALTNAME;
@@ -249,10 +249,10 @@ cd9660_rrip_altname(p,ana)
 		*ana->outlen = 0;
 		return 0;
 	}
-	
+
 	bcopy(inbuf,ana->outbuf,wlen);
 	ana->outbuf += wlen;
-	
+
 	if (!cont) {
 		ana->fields &= ~ISO_SUSP_ALTNAME;
 		return ISO_SUSP_ALTNAME;
@@ -314,55 +314,55 @@ cd9660_rrip_tstamp(p,ana)
 	ISO_RRIP_ANALYZE *ana;
 {
 	unsigned char *ptime;
-	
+
 	ptime = p->time;
-	
+
 	/* Check a format of time stamp (7bytes/17bytes) */
 	if (!(*p->flags&ISO_SUSP_TSTAMP_FORM17)) {
 		if (*p->flags&ISO_SUSP_TSTAMP_CREAT)
 			ptime += 7;
-		
+
 		if (*p->flags&ISO_SUSP_TSTAMP_MODIFY) {
 			cd9660_tstamp_conv7(ptime,&ana->inop->inode.iso_mtime,
 					    ISO_FTYPE_RRIP);
 			ptime += 7;
 		} else
 			bzero(&ana->inop->inode.iso_mtime,sizeof(struct timespec));
-		
+
 		if (*p->flags&ISO_SUSP_TSTAMP_ACCESS) {
 			cd9660_tstamp_conv7(ptime,&ana->inop->inode.iso_atime,
 					    ISO_FTYPE_RRIP);
 			ptime += 7;
 		} else
 			ana->inop->inode.iso_atime = ana->inop->inode.iso_mtime;
-		
+
 		if (*p->flags&ISO_SUSP_TSTAMP_ATTR)
 			cd9660_tstamp_conv7(ptime,&ana->inop->inode.iso_ctime,
 					    ISO_FTYPE_RRIP);
 		else
 			ana->inop->inode.iso_ctime = ana->inop->inode.iso_mtime;
-		
+
 	} else {
 		if (*p->flags&ISO_SUSP_TSTAMP_CREAT)
 			ptime += 17;
-		
+
 		if (*p->flags&ISO_SUSP_TSTAMP_MODIFY) {
 			cd9660_tstamp_conv17(ptime,&ana->inop->inode.iso_mtime);
 			ptime += 17;
 		} else
 			bzero(&ana->inop->inode.iso_mtime,sizeof(struct timespec));
-		
+
 		if (*p->flags&ISO_SUSP_TSTAMP_ACCESS) {
 			cd9660_tstamp_conv17(ptime,&ana->inop->inode.iso_atime);
 			ptime += 17;
 		} else
 			ana->inop->inode.iso_atime = ana->inop->inode.iso_mtime;
-		
+
 		if (*p->flags&ISO_SUSP_TSTAMP_ATTR)
 			cd9660_tstamp_conv17(ptime,&ana->inop->inode.iso_ctime);
 		else
 			ana->inop->inode.iso_ctime = ana->inop->inode.iso_mtime;
-		
+
 	}
 	ana->fields &= ~ISO_SUSP_TSTAMP;
 	return ISO_SUSP_TSTAMP;
@@ -385,10 +385,10 @@ cd9660_rrip_device(p,ana)
 	ISO_RRIP_ANALYZE *ana;
 {
 	unsigned high, low;
-	
+
 	high = isonum_733(p->dev_t_high_l);
 	low  = isonum_733(p->dev_t_low_l);
-	
+
 	if ( high == 0 ) {
 		ana->inop->inode.iso_rdev = makedev( major(low), minor(low) );
 	} else {
@@ -410,7 +410,7 @@ cd9660_rrip_idflag(p,ana)
 	/* special handling of RE field */
 	if (ana->fields&ISO_SUSP_RELDIR)
 		return cd9660_rrip_reldir(p,ana);
-	
+
 	return ISO_SUSP_IDFLAG;
 }
 
@@ -476,7 +476,7 @@ cd9660_rrip_loop(isodir,ana,table)
 	struct buf *bp = NULL;
 	char *pwhead;
 	int result;
-	
+
 	/*
 	 * Note: If name length is odd,
 	 *	 it will be padding 1 byte after the name
@@ -484,23 +484,23 @@ cd9660_rrip_loop(isodir,ana,table)
 	pwhead = isodir->name + isonum_711(isodir->name_len);
 	if (!(isonum_711(isodir->name_len)&1))
 		pwhead++;
-	
+
 	/* If it's not the '.' entry of the root dir obey SP field */
 	if (*isodir->name != 0
 	    || isonum_733(isodir->extent) != ana->imp->root_extent)
 		pwhead += ana->imp->rr_skip;
 	else
 		pwhead += ana->imp->rr_skip0;
-	
+
 	phead = (ISO_SUSP_HEADER *)pwhead;
 	pend = (ISO_SUSP_HEADER *)((char *)isodir + isonum_711(isodir->length));
-	
+
 	result = 0;
 	while (1) {
 		ana->iso_ce_len = 0;
 		/*
 		 * Note: "pend" should be more than one SUSP header
-		 */ 
+		 */
 		while (pend >= phead + 1) {
 			if (isonum_711(phead->version) == 1) {
 				for (ptable = table; ptable->func; ptable++) {
@@ -519,7 +519,7 @@ cd9660_rrip_loop(isodir,ana,table)
 			 */
 			phead = (ISO_SUSP_HEADER *)((char *)phead + isonum_711(phead->length));
 		}
-		
+
 		if ( ana->fields && ana->iso_ce_len ) {
 			if (ana->iso_ce_blk >= ana->imp->volume_space_size
 			    || ana->iso_ce_off + ana->iso_ce_len > ana->imp->logical_block_size
@@ -542,7 +542,7 @@ cd9660_rrip_loop(isodir,ana,table)
 	for (ptable = table; ptable->func2; ptable++)
 		if (!(ptable->result&result))
 			ptable->func2(isodir,ana);
-	
+
 	return result;
 }
 
@@ -563,17 +563,17 @@ cd9660_rrip_analyze(isodir,inop,imp)
 	struct iso_mnt *imp;
 {
 	ISO_RRIP_ANALYZE analyze;
-	
+
 	analyze.inop = inop;
 	analyze.imp = imp;
 	analyze.fields = ISO_SUSP_ATTR|ISO_SUSP_TSTAMP|ISO_SUSP_DEVICE;
-	
+
 	return cd9660_rrip_loop(isodir,&analyze,rrip_table_analyze);
 }
 
-/* 
- * Get Alternate Name from 'AL' record 
- * If either no AL record or 0 length, 
+/*
+ * Get Alternate Name from 'AL' record
+ * If either no AL record or 0 length,
  *    it will be return the translated ISO9660 name,
  */
 static RRIP_TABLE rrip_table_getname[] = {
@@ -597,7 +597,7 @@ cd9660_rrip_getname(isodir,outbuf,outlen,inump,imp)
 {
 	ISO_RRIP_ANALYZE analyze;
 	RRIP_TABLE *tab;
-	
+
 	analyze.outbuf = outbuf;
 	analyze.outlen = outlen;
 	analyze.maxlen = NAME_MAX;
@@ -605,21 +605,21 @@ cd9660_rrip_getname(isodir,outbuf,outlen,inump,imp)
 	analyze.imp = imp;
 	analyze.fields = ISO_SUSP_ALTNAME|ISO_SUSP_RELDIR|ISO_SUSP_CLINK|ISO_SUSP_PLINK;
 	*outlen = 0;
-	
+
 	tab = rrip_table_getname;
 	if (*isodir->name == 0
 	    || *isodir->name == 1) {
 		cd9660_rrip_defname(isodir,&analyze);
-		
+
 		analyze.fields &= ~ISO_SUSP_ALTNAME;
 		tab++;
 	}
-	
+
 	return cd9660_rrip_loop(isodir,&analyze,tab);
 }
 
-/* 
- * Get Symbolic Name from 'SL' record 
+/*
+ * Get Symbolic Name from 'SL' record
  *
  * Note: isodir should contains SL record!
  */
@@ -639,7 +639,7 @@ cd9660_rrip_getsymname(isodir,outbuf,outlen,imp)
 	struct iso_mnt *imp;
 {
 	ISO_RRIP_ANALYZE analyze;
-	
+
 	analyze.outbuf = outbuf;
 	analyze.outlen = outlen;
 	*outlen = 0;
@@ -647,7 +647,7 @@ cd9660_rrip_getsymname(isodir,outbuf,outlen,imp)
 	analyze.cont = 1;		/* don't start with a slash */
 	analyze.imp = imp;
 	analyze.fields = ISO_SUSP_SLINK;
-	
+
 	return (cd9660_rrip_loop(isodir,&analyze,rrip_table_getsymname)&ISO_SUSP_SLINK);
 }
 
@@ -669,7 +669,7 @@ cd9660_rrip_offset(isodir,imp)
 {
 	ISO_RRIP_OFFSET *p;
 	ISO_RRIP_ANALYZE analyze;
-	
+
 	imp->rr_skip0 = 0;
 	p = (ISO_RRIP_OFFSET *)(isodir->name + 1);
 	if (bcmp(p,"SP\7\1\276\357",6)) {
@@ -679,11 +679,11 @@ cd9660_rrip_offset(isodir,imp)
 		if (bcmp(p,"SP\7\1\276\357",6))
 			return -1;
 	}
-	
+
 	analyze.imp = imp;
 	analyze.fields = ISO_SUSP_EXTREF;
 	if (!(cd9660_rrip_loop(isodir,&analyze,rrip_table_extref)&ISO_SUSP_EXTREF))
 		return -1;
-	
+
 	return isonum_711(p->skip);
 }
diff --git a/sys/fs/cd9660/cd9660_util.c b/sys/fs/cd9660/cd9660_util.c
index 52a80d75ce42..3d58e4e16d57 100644
--- a/sys/fs/cd9660/cd9660_util.c
+++ b/sys/fs/cd9660/cd9660_util.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_util.c	8.1 (Berkeley) 1/21/94
- * $Id$
+ * $Id: cd9660_util.c,v 1.3 1994/08/02 07:41:31 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -159,7 +159,7 @@ isofncmp(unsigned char *fn,int fnlen,unsigned char *isofn,int isolen)
 {
 	int i, j;
 	unsigned char c;
-	
+
 	while (--fnlen >= 0) {
 		if (--isolen < 0)
 			return *fn;
@@ -216,14 +216,14 @@ isofntrans(unsigned char *infn,int infnlen,
 	   int original,int assoc)
 {
 	int fnidx = 0;
-	
+
 	if (assoc) {
 		*outfn++ = ASSOCCHAR;
 		fnidx++;
 	}
 	for (; fnidx < infnlen; fnidx++) {
 		char c = *infn++;
-		
+
 		if (!original && c >= 'A' && c <= 'Z')
 			*outfn++ = c + ('a' - 'A');
 		else if (!original && c == '.' && *infn == ';')
diff --git a/sys/fs/cd9660/cd9660_vfsops.c b/sys/fs/cd9660/cd9660_vfsops.c
index 8fc30a85e385..afa08f473811 100644
--- a/sys/fs/cd9660/cd9660_vfsops.c
+++ b/sys/fs/cd9660/cd9660_vfsops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_vfsops.c	8.3 (Berkeley) 1/31/94
- * $Id: cd9660_vfsops.c,v 1.11 1995/03/16 20:23:24 wollman Exp $
+ * $Id: cd9660_vfsops.c,v 1.12 1995/05/19 03:25:35 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -92,7 +92,7 @@ cd9660_mountroot()
 	u_int size;
 	int error;
 	struct iso_args args;
-	
+
 	/*
 	 * Get vnode for rootdev.
 	 */
@@ -152,13 +152,13 @@ cd9660_mount(mp, path, data, ndp, p)
 	u_int size;
 	int error;
 	struct iso_mnt *imp = 0;
-	
+
 	if ((error = copyin(data, (caddr_t)&args, sizeof (struct iso_args))))
 		return (error);
-	
+
 	if ((mp->mnt_flag & MNT_RDONLY) == 0)
 		return (EROFS);
-	
+
 	/*
 	 * If updating, check whether changing from read-only to
 	 * read/write; if there is no device name, that's all we do.
@@ -233,10 +233,10 @@ iso_mountfs(devvp, mp, p, argp)
 	struct iso_sierra_primary_descriptor *pri_sierra;
 	struct iso_directory_record *rootp;
 	int logical_block_size;
-	
+
 	if (!ronly)
 		return EROFS;
-	
+
 	/*
 	 * Disallow multiple mounts of the same device.
 	 * Disallow mounting of a device that is currently in use
@@ -253,18 +253,18 @@ iso_mountfs(devvp, mp, p, argp)
 	if ((error = VOP_OPEN(devvp, ronly ? FREAD : FREAD|FWRITE, FSCRED, p)))
 		return error;
 	needclose = 1;
-	
+
 	/* This is the "logical sector size".  The standard says this
 	 * should be 2048 or the physical sector size on the device,
 	 * whichever is greater.  For now, we'll just use a constant.
 	 */
 	iso_bsize = ISO_DEFAULT_BLOCK_SIZE;
-	
+
 	for (iso_blknum = 16; iso_blknum < 100; iso_blknum++) {
 		if ((error = bread (devvp, btodb(iso_blknum * iso_bsize),
 				    iso_bsize, NOCRED, &bp)))
 			goto out;
-		
+
 		vdp = (struct iso_volume_descriptor *)bp->b_un.b_addr;
 		if (bcmp (vdp->id, ISO_STANDARD_ID, sizeof vdp->id) != 0) {
 			if (bcmp (vdp->id_sierra, ISO_SIERRA_ID,
@@ -274,41 +274,41 @@ iso_mountfs(devvp, mp, p, argp)
 			} else
 				high_sierra = 1;
 		}
-		
+
 		if (isonum_711 (high_sierra? vdp->type_sierra: vdp->type) == ISO_VD_END) {
 			error = EINVAL;
 			goto out;
 		}
-		
+
 		if (isonum_711 (high_sierra? vdp->type_sierra: vdp->type) == ISO_VD_PRIMARY)
 			break;
 		brelse(bp);
 	}
-	
+
 	if (isonum_711 (high_sierra? vdp->type_sierra: vdp->type) != ISO_VD_PRIMARY) {
 		error = EINVAL;
 		goto out;
 	}
-	
+
 	pri = (struct iso_primary_descriptor *)vdp;
 	pri_sierra = (struct iso_sierra_primary_descriptor *)vdp;
-	
+
 	logical_block_size =
 		isonum_723 (high_sierra?
 			    pri_sierra->logical_block_size:
 			    pri->logical_block_size);
-	
+
 	if (logical_block_size < DEV_BSIZE || logical_block_size > MAXBSIZE
 	    || (logical_block_size & (logical_block_size - 1)) != 0) {
 		error = EINVAL;
 		goto out;
 	}
-	
+
 	rootp = (struct iso_directory_record *)
 		(high_sierra?
 		 pri_sierra->root_directory_record:
 		 pri->root_directory_record);
-	
+
 	isomp = malloc(sizeof *isomp, M_ISOFSMNT, M_WAITOK);
 	bzero((caddr_t)isomp, sizeof *isomp);
 	isomp->logical_block_size = logical_block_size;
@@ -319,16 +319,16 @@ iso_mountfs(devvp, mp, p, argp)
 	bcopy (rootp, isomp->root, sizeof isomp->root);
 	isomp->root_extent = isonum_733 (rootp->extent);
 	isomp->root_size = isonum_733 (rootp->size);
-	
+
 	isomp->im_bmask = logical_block_size - 1;
 	isomp->im_bshift = 0;
 	while ((1 << isomp->im_bshift) < isomp->logical_block_size)
 		isomp->im_bshift++;
-	
+
 	bp->b_flags |= B_AGE;
 	brelse(bp);
 	bp = NULL;
-	
+
 	mp->mnt_data = (qaddr_t)isomp;
 	mp->mnt_stat.f_fsid.val[0] = (long)dev;
 	mp->mnt_stat.f_fsid.val[1] = MOUNT_CD9660;
@@ -337,9 +337,9 @@ iso_mountfs(devvp, mp, p, argp)
 	isomp->im_mountp = mp;
 	isomp->im_dev = dev;
 	isomp->im_devvp = devvp;
-	
+
 	devvp->v_specflags |= SI_MOUNTEDON;
-	
+
 	/* Check the Rock Ridge Extention support */
 	if (!(argp->flags & ISOFSMNT_NORRIP)) {
 		if ((error = bread (isomp->im_devvp,
@@ -347,15 +347,15 @@ iso_mountfs(devvp, mp, p, argp)
 				   * isomp->logical_block_size / DEV_BSIZE,
 				   isomp->logical_block_size,NOCRED,&bp)))
 		    goto out;
-		
+
 		rootp = (struct iso_directory_record *)bp->b_un.b_addr;
-		
+
 		if ((isomp->rr_skip = cd9660_rrip_offset(rootp,isomp)) < 0) {
 		    argp->flags	 |= ISOFSMNT_NORRIP;
 		} else {
 		    argp->flags	 &= ~ISOFSMNT_GENS;
 		}
-		
+
 		/*
 		 * The contents are valid,
 		 * but they will get reread as part of another vnode, so...
@@ -381,7 +381,7 @@ iso_mountfs(devvp, mp, p, argp)
 			  isomp->iso_ftype = ISO_FTYPE_RRIP;
 			  break;
 		}
-	
+
 	return 0;
 out:
 	if (bp)
@@ -420,7 +420,7 @@ cd9660_unmount(mp, mntflags, p)
 {
 	register struct iso_mnt *isomp;
 	int error, flags = 0;
-	
+
 	if (mntflags & MNT_FORCE) {
 		if (!iso_doforce)
 			return (EINVAL);
@@ -440,7 +440,7 @@ cd9660_unmount(mp, mntflags, p)
 	if (isomp->iso_ftype == ISO_FTYPE_RRIP)
 		iso_dunmap(isomp->im_dev);
 #endif
-	
+
 	isomp->im_devvp->v_specflags &= ~SI_MOUNTEDON;
 	error = VOP_CLOSE(isomp->im_devvp, FREAD, NOCRED, p);
 	vrele(isomp->im_devvp);
@@ -464,7 +464,7 @@ cd9660_root(mp, vpp)
 	int error;
 	struct iso_mnt *imp = VFSTOISOFS (mp);
 	struct iso_directory_record *dp;
-	
+
 	tvp.v_mount = mp;
 	tvp.v_data = &tip;
 	ip = VTOI(&tvp);
@@ -473,7 +473,7 @@ cd9660_root(mp, vpp)
 	ip->i_diroff = 0;
 	dp = (struct iso_directory_record *)imp->root;
 	isodirino(&ip->i_number,dp,imp);
-	
+
 	/*
 	 * With RRIP we must use the `.' entry of the root directory.
 	 * Simply tell iget, that it's a relocated directory.
@@ -513,9 +513,9 @@ cd9660_statfs(mp, sbp, p)
 	struct proc *p;
 {
 	register struct iso_mnt *isomp;
-	
+
 	isomp = VFSTOISOFS(mp);
-	
+
 	sbp->f_type = MOUNT_CD9660;
 	sbp->f_bsize = isomp->logical_block_size;
 	sbp->f_iosize = sbp->f_bsize;	/* XXX */
@@ -597,15 +597,15 @@ cd9660_fhtovp(mp, fhp, nam, vpp, exflagsp, credanonp)
 	struct iso_directory_record	*dirp;
 	struct iso_node			tip, *ip, *nip;
 	struct netcred			*np;
-	
+
 	imp = VFSTOISOFS (mp);
 	ifhp = (struct ifid *)fhp;
-	
+
 #ifdef	ISOFS_DBG
 	printf("fhtovp: ino %d, start %ld\n",
 	       ifhp->ifid_ino, ifhp->ifid_start);
 #endif
-	
+
 	np = vfs_export_lookup(mp, &imp->im_export, nam);
 	if (np == NULL)
 		return (EACCES);
@@ -615,14 +615,14 @@ cd9660_fhtovp(mp, fhp, nam, vpp, exflagsp, credanonp)
 		printf("fhtovp: lbn exceed volume space %d\n", lbn);
 		return (ESTALE);
 	}
-	
+
 	off = iso_blkoff(imp, ifhp->ifid_ino);
 	if (off + ISO_DIRECTORY_RECORD_SIZE > imp->logical_block_size) {
 		printf("fhtovp: crosses block boundary %d\n",
 		       off + ISO_DIRECTORY_RECORD_SIZE);
 		return (ESTALE);
 	}
-	
+
 	error = bread(imp->im_devvp, btodb(lbn * imp->logical_block_size),
 		      imp->logical_block_size, NOCRED, &bp);
 	if (error) {
@@ -630,7 +630,7 @@ cd9660_fhtovp(mp, fhp, nam, vpp, exflagsp, credanonp)
 		brelse(bp);
 		return (error);
 	}
-	
+
 	dirp = (struct iso_directory_record *)(bp->b_un.b_addr + off);
 	if (off + isonum_711(dirp->length) > imp->logical_block_size) {
 		brelse(bp);
@@ -639,7 +639,7 @@ cd9660_fhtovp(mp, fhp, nam, vpp, exflagsp, credanonp)
 		       isonum_711(dirp->length));
 		return (ESTALE);
 	}
-	
+
 	if (isonum_733(dirp->extent) + isonum_711(dirp->ext_attr_length) !=
 	    ifhp->ifid_start) {
 		brelse(bp);
@@ -649,7 +649,7 @@ cd9660_fhtovp(mp, fhp, nam, vpp, exflagsp, credanonp)
 		return (ESTALE);
 	}
 	brelse(bp);
-	
+
 	ip = &tip;
 	tvp.v_mount = mp;
 	tvp.v_data = ip;
@@ -687,13 +687,13 @@ cd9660_vptofh(vp, fhp)
 {
 	register struct iso_node *ip = VTOI(vp);
 	register struct ifid *ifhp;
-	
+
 	ifhp = (struct ifid *)fhp;
 	ifhp->ifid_len = sizeof(struct ifid);
-	
+
 	ifhp->ifid_ino = ip->i_number;
 	ifhp->ifid_start = ip->iso_start;
-	
+
 #ifdef	ISOFS_DBG
 	printf("vptofh: ino %d, start %ld\n",
 	       ifhp->ifid_ino,ifhp->ifid_start);
diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c
index 5e403e3fc962..3b538a8d0cb5 100644
--- a/sys/fs/cd9660/cd9660_vnops.c
+++ b/sys/fs/cd9660/cd9660_vnops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_vnops.c	8.3 (Berkeley) 1/23/94
- * $Id: cd9660_vnops.c,v 1.12 1995/02/13 06:12:32 phk Exp $
+ * $Id: cd9660_vnops.c,v 1.13 1995/03/28 07:46:38 phk Exp $
  */
 
 #include <sys/param.h>
@@ -81,10 +81,10 @@ cd9660_mknod(ndp, vap, cred, p)
 	struct iso_node *ip;
 	struct iso_dnode *dp;
 	int error;
-	
+
 	vp = ndp->ni_vp;
 	ip = VTOI(vp);
-	
+
 	if (ip->i_mnt->iso_ftype != ISO_FTYPE_RRIP
 	    || vap->va_type != vp->v_type
 	    || (vap->va_type != VCHR && vap->va_type != VBLK)) {
@@ -93,7 +93,7 @@ cd9660_mknod(ndp, vap, cred, p)
 		vput(ndp->ni_vp);
 		return EINVAL;
 	}
-	
+
 	dp = iso_dmap(ip->i_dev,ip->i_number,1);
 	if (ip->inode.iso_rdev == vap->va_rdev || vap->va_rdev == VNOVAL) {
 		/* same as the unmapped one, delete the mapping */
@@ -102,7 +102,7 @@ cd9660_mknod(ndp, vap, cred, p)
 	} else
 		/* enter new mapping */
 		dp->d_dev = vap->va_rdev;
-	
+
 	/*
 	 * Remove inode so that it will be reloaded by iget and
 	 * checked to see if it is an alias of an existing entry
@@ -237,7 +237,7 @@ cd9660_read(ap)
 	off_t diff;
 	int rasize, error = 0;
 	long size, n, on;
-	
+
 	if (uio->uio_resid == 0)
 		return (0);
 	if (uio->uio_offset < 0)
@@ -260,7 +260,7 @@ cd9660_read(ap)
 			if (iso_lblktosize(imp, rablock) <= ip->i_size)
 				error = cluster_read(vp, (off_t)ip->i_size,
 						     lbn, size, NOCRED, &bp);
-			else 
+			else
 				error = bread(vp, lbn, size, NOCRED, &bp);
 		} else {
 			if (vp->v_lastr + 1 == lbn &&
@@ -380,25 +380,25 @@ iso_uiodir(idp,dp,off)
 	off_t off;
 {
 	int error;
-	
+
 	dp->d_name[dp->d_namlen] = 0;
 	dp->d_reclen = DIRSIZ(dp);
-	
+
 	if (idp->uio->uio_resid < dp->d_reclen) {
 		idp->eof = 0;
 		return -1;
 	}
-	
+
 	if (idp->cookiep) {
 		if (idp->ncookies <= 0) {
 			idp->eof = 0;
 			return -1;
 		}
-		
+
 		*idp->cookiep++ = off;
 		--idp->ncookies;
 	}
-	
+
 	if ((error = uiomove((caddr_t)dp,dp->d_reclen,idp->uio)))
 		return error;
 	idp->uio_off = off;
@@ -413,7 +413,7 @@ iso_shipdir(idp)
 	int cl, sl, assoc;
 	int error;
 	char *cname, *sname;
-	
+
 	cl = idp->current.d_namlen;
 	cname = idp->current.d_name;
 assoc = (cl > 1) && (*cname == ASSOCCHAR);
@@ -421,7 +421,7 @@ assoc = (cl > 1) && (*cname == ASSOCCHAR);
 		cl--;
 		cname++;
 	}
-	
+
 	dp = &idp->saveent;
 	sname = dp->d_name;
 	if (!(sl = dp->d_namlen)) {
@@ -483,10 +483,10 @@ cd9660_readdir(ap)
 	u_short tmplen;
 	int ncookies = 0;
 	u_int *cookies = NULL;
-	
+
 	ip = VTOI(ap->a_vp);
 	imp = ip->i_mnt;
-	
+
 	MALLOC(idp,struct isoreaddir *,sizeof(*idp),M_TEMP,M_WAITOK);
 	idp->saveent.d_namlen = 0;
 	idp->assocent.d_namlen = 0;
@@ -503,7 +503,7 @@ cd9660_readdir(ap)
 		idp->cookiep = 0;
 	idp->eof = 0;
 	idp->curroff = uio->uio_offset;
-	
+
 	entryoffsetinblock = iso_blkoff(imp, idp->curroff);
 	if (entryoffsetinblock != 0) {
 		if ((error = iso_blkatoff(ip, idp->curroff, &bp))) {
@@ -511,16 +511,16 @@ cd9660_readdir(ap)
 			return (error);
 		}
 	}
-	
+
 	endsearch = ip->i_size;
-	
+
 	while (idp->curroff < endsearch) {
 		/*
 		 * If offset is on a block boundary,
 		 * read the next directory block.
 		 * Release previous if it exists.
 		 */
-		
+
 		if (iso_blkoff(imp, idp->curroff) == 0) {
 			if (bp != NULL)
 				brelse(bp);
@@ -531,10 +531,10 @@ cd9660_readdir(ap)
 		/*
 		 * Get pointer to next entry.
 		 */
-		
+
 		ep = (struct iso_directory_record *)
 			(bp->b_un.b_addr + entryoffsetinblock);
-		
+
 		reclen = isonum_711 (ep->length);
 		isoflags = isonum_711(imp->iso_ftype == ISO_FTYPE_HIGH_SIERRA?
 				      &ep->date[6]: ep->flags);
@@ -544,19 +544,19 @@ cd9660_readdir(ap)
 						imp->logical_block_size);
 			continue;
 		}
-		
+
 		if (reclen < ISO_DIRECTORY_RECORD_SIZE) {
 			error = EINVAL;
 			/* illegal entry, stop */
 			break;
 		}
-		
+
 		if (entryoffsetinblock + reclen > imp->logical_block_size) {
 			error = EINVAL;
 			/* illegal directory, so stop looking */
 			break;
 		}
-		
+
 		/* XXX: be more intelligent if we can */
 		idp->current.d_type = DT_UNKNOWN;
 
@@ -566,13 +566,13 @@ cd9660_readdir(ap)
 		else
 			idp->current.d_fileno = dbtob(bp->b_blkno) +
 				idp->curroff;
-		
+
 		if (reclen < ISO_DIRECTORY_RECORD_SIZE + idp->current.d_namlen) {
 			error = EINVAL;
 			/* illegal entry, stop */
 			break;
 		}
-		
+
 		idp->curroff += reclen;
 		/*
 		 *
@@ -612,10 +612,10 @@ cd9660_readdir(ap)
 		}
 		if (error)
 			break;
-		
+
 		entryoffsetinblock += reclen;
 	}
-	
+
 	if (!error && imp->iso_ftype == ISO_FTYPE_DEFAULT) {
 		idp->current.d_namlen = 0;
 		error = iso_shipdir(idp);
@@ -634,16 +634,16 @@ cd9660_readdir(ap)
 			*ap->a_cookies = cookies;
 		}
 	}
-	
+
 	if (bp)
 		brelse (bp);
 
 	uio->uio_offset = idp->uio_off;
 	if (ap->a_eofflag)
 	    *ap->a_eofflag = idp->eof;
-	
+
 	FREE(idp,M_TEMP);
-	
+
 	return (error);
 }
 
@@ -665,19 +665,19 @@ cd9660_readlink(ap)
 	} */ *ap;
 {
 	ISONODE	*ip;
-	ISODIR	*dirp;			 
+	ISODIR	*dirp;
 	ISOMNT	*imp;
 	struct	buf *bp;
 	u_short	symlen;
 	int	error;
 	char	*symname;
-	
+
 	ip  = VTOI(ap->a_vp);
 	imp = ip->i_mnt;
-	
+
 	if (imp->iso_ftype != ISO_FTYPE_RRIP)
 		return EINVAL;
-	
+
 	/*
 	 * Get parents directory record block that this inode included.
 	 */
@@ -706,7 +706,7 @@ cd9660_readlink(ap)
 	       ip->i_number,
 	       ip->i_number & imp->im_bmask );
 #endif
-	
+
 	/*
 	 * Just make sure, we have a right one....
 	 *   1: Check not cross boundary on block
@@ -716,13 +716,13 @@ cd9660_readlink(ap)
 		brelse(bp);
 		return EINVAL;
 	}
-	
+
 	/*
 	 * Now get a buffer
 	 * Abuse a namei buffer for now.
 	 */
 	MALLOC(symname,char *,MAXPATHLEN,M_NAMEI,M_WAITOK);
-	
+
 	/*
 	 * Ok, we just gathering a symbolic name in SL record.
 	 */
@@ -735,14 +735,14 @@ cd9660_readlink(ap)
 	 * Don't forget before you leave from home ;-)
 	 */
 	brelse(bp);
-	
+
 	/*
 	 * return with the symbolic name to caller's.
 	 */
 	error = uiomove(symname,symlen,ap->a_uio);
-	
+
 	FREE(symname,M_NAMEI);
-	
+
 	return error;
 }
 
diff --git a/sys/fs/cd9660/iso.h b/sys/fs/cd9660/iso.h
index 858dbb3b7578..406572e42e0c 100644
--- a/sys/fs/cd9660/iso.h
+++ b/sys/fs/cd9660/iso.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso.h	8.2 (Berkeley) 1/23/94
- * $Id: iso.h,v 1.3 1994/09/09 11:11:01 dfr Exp $
+ * $Id: iso.h,v 1.4 1995/01/16 17:03:29 joerg Exp $
  */
 
 #define ISODCL(from, to) (to - from + 1)
@@ -189,16 +189,16 @@ struct iso_mnt {
 	int logical_block_size;
 	int im_bshift;
 	int im_bmask;
-	
+
 	int volume_space_size;
 	char im_fsmnt[50];
 	struct netexport im_export;
-	
+
 	char root[ISODCL (157, 190)];
 	int root_extent;
 	int root_size;
 	enum ISO_FTYPE	iso_ftype;
-	
+
 	int rr_skip;
 	int rr_skip0;
 };
@@ -228,13 +228,13 @@ int cd9660_vptofh __P((struct vnode *, struct fid *));
 int cd9660_init __P(());
 
 struct iso_node;
-int iso_blkatoff __P((struct iso_node *ip, long offset, struct buf **bpp)); 
+int iso_blkatoff __P((struct iso_node *ip, long offset, struct buf **bpp));
 int iso_iget __P((struct iso_node *xp, ino_t ino, int relocated,
 		  struct iso_node **ipp, struct iso_directory_record *isodir));
-int iso_iput __P((struct iso_node *ip)); 
-int iso_ilock __P((struct iso_node *ip)); 
-int iso_iunlock __P((struct iso_node *ip)); 
-int cd9660_mountroot __P((void)); 
+int iso_iput __P((struct iso_node *ip));
+int iso_ilock __P((struct iso_node *ip));
+int iso_iunlock __P((struct iso_node *ip));
+int cd9660_mountroot __P((void));
 
 extern int (**cd9660_vnodeop_p)();
 
diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c
index 6c20b26bc527..420320acab7e 100644
--- a/sys/fs/fdescfs/fdesc_vnops.c
+++ b/sys/fs/fdescfs/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/fs/fifofs/fifo_vnops.c b/sys/fs/fifofs/fifo_vnops.c
index bf1ec828c434..106ac89661ca 100644
--- a/sys/fs/fifofs/fifo_vnops.c
+++ b/sys/fs/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/fs/msdosfs/bootsect.h b/sys/fs/msdosfs/bootsect.h
index 099b15f661f9..f83b9ec0b1a1 100644
--- a/sys/fs/msdosfs/bootsect.h
+++ b/sys/fs/msdosfs/bootsect.h
@@ -1,19 +1,19 @@
-/*	$Id$ */
+/*	$Id: bootsect.h,v 1.1 1994/09/19 15:41:36 dfr Exp $ */
 /*	$NetBSD: bootsect.h,v 1.4 1994/06/29 06:35:28 cgd Exp $	*/
 
 /*
  * Written by Paul Popelka (paulp@uts.amdahl.com)
- * 
+ *
  * You can do anything you want with this software, just don't say you wrote
  * it, and don't remove this notice.
- * 
+ *
  * This software is provided "as is".
- * 
+ *
  * The author supplies this software to be publicly redistributed on the
  * understanding that the author is not responsible for the correct
  * functioning of this software in any circumstances and is not liable for
  * any damages caused by this software.
- * 
+ *
  * October 1992
  */
 
diff --git a/sys/fs/msdosfs/bpb.h b/sys/fs/msdosfs/bpb.h
index 70e4de201a0f..7618126c3101 100644
--- a/sys/fs/msdosfs/bpb.h
+++ b/sys/fs/msdosfs/bpb.h
@@ -1,19 +1,19 @@
-/*	$Id$ */
+/*	$Id: bpb.h,v 1.1 1994/09/19 15:41:37 dfr Exp $ */
 /*	$NetBSD: bpb.h,v 1.3 1994/06/29 06:35:29 cgd Exp $	*/
 
 /*
  * Written by Paul Popelka (paulp@uts.amdahl.com)
- * 
+ *
  * You can do anything you want with this software, just don't say you wrote
  * it, and don't remove this notice.
- * 
+ *
  * This software is provided "as is".
- * 
+ *
  * The author supplies this software to be publicly redistributed on the
  * understanding that the author is not responsible for the correct
  * functioning of this software in any circumstances and is not liable for
  * any damages caused by this software.
- * 
+ *
  * October 1992
  */
 
diff --git a/sys/fs/msdosfs/denode.h b/sys/fs/msdosfs/denode.h
index b47196adbd7f..a7f2928ec8c5 100644
--- a/sys/fs/msdosfs/denode.h
+++ b/sys/fs/msdosfs/denode.h
@@ -1,4 +1,4 @@
-/*	$Id: denode.h,v 1.3 1994/12/27 12:37:33 bde Exp $ */
+/*	$Id: denode.h,v 1.4 1995/03/16 18:14:17 bde Exp $ */
 /*	$NetBSD: denode.h,v 1.8 1994/08/21 18:43:49 ws Exp $	*/
 
 /*-
@@ -34,17 +34,17 @@
  */
 /*
  * Written by Paul Popelka (paulp@uts.amdahl.com)
- * 
+ *
  * You can do anything you want with this software, just don't say you wrote
  * it, and don't remove this notice.
- * 
+ *
  * This software is provided "as is".
- * 
+ *
  * The author supplies this software to be publicly redistributed on the
  * understanding that the author is not responsible for the correct
  * functioning of this software in any circumstances and is not liable for
  * any damages caused by this software.
- * 
+ *
  * October 1992
  */
 
diff --git a/sys/fs/msdosfs/direntry.h b/sys/fs/msdosfs/direntry.h
index d2ec0190e44b..f4eecac02d97 100644
--- a/sys/fs/msdosfs/direntry.h
+++ b/sys/fs/msdosfs/direntry.h
@@ -1,4 +1,4 @@
-/*	$Id$ */
+/*	$Id: direntry.h,v 1.1 1994/09/19 15:41:39 dfr Exp $ */
 /*	$NetBSD: direntry.h,v 1.7 1994/08/21 18:43:54 ws Exp $	*/
 
 /*-
@@ -34,17 +34,17 @@
  */
 /*
  * Written by Paul Popelka (paulp@uts.amdahl.com)
- * 
+ *
  * You can do anything you want with this software, just don't say you wrote
  * it, and don't remove this notice.
- * 
+ *
  * This software is provided "as is".
- * 
+ *
  * The author supplies this software to be publicly redistributed on the
  * understanding that the author is not responsible for the correct
  * functioning of this software in any circumstances and is not liable for
  * any damages caused by this software.
- * 
+ *
  * October 1992
  */
 
diff --git a/sys/fs/msdosfs/fat.h b/sys/fs/msdosfs/fat.h
index b5f223f46db3..3b043c14d230 100644
--- a/sys/fs/msdosfs/fat.h
+++ b/sys/fs/msdosfs/fat.h
@@ -1,4 +1,4 @@
-/*	$Id: fat.h,v 1.1 1994/09/19 15:41:40 dfr Exp $ */
+/*	$Id: fat.h,v 1.2 1994/09/27 20:42:41 phk Exp $ */
 /*	$NetBSD: fat.h,v 1.4 1994/08/21 18:43:57 ws Exp $	*/
 
 /*-
@@ -34,17 +34,17 @@
  */
 /*
  * Written by Paul Popelka (paulp@uts.amdahl.com)
- * 
+ *
  * You can do anything you want with this software, just don't say you wrote
  * it, and don't remove this notice.
- * 
+ *
  * This software is provided "as is".
- * 
+ *
  * The author supplies this software to be publicly redistributed on the
  * understanding that the author is not responsible for the correct
  * functioning of this software in any circumstances and is not liable for
  * any damages caused by this software.
- * 
+ *
  * October 1992
  */
 
diff --git a/sys/fs/msdosfs/msdosfs_conv.c b/sys/fs/msdosfs/msdosfs_conv.c
index d351a4809f90..88999827db52 100644
--- a/sys/fs/msdosfs/msdosfs_conv.c
+++ b/sys/fs/msdosfs/msdosfs_conv.c
@@ -1,19 +1,19 @@
-/*	$Id: msdosfs_conv.c,v 1.3 1994/12/12 12:35:42 bde Exp $ */
+/*	$Id: msdosfs_conv.c,v 1.4 1995/03/29 18:48:06 ache Exp $ */
 /*	$NetBSD: msdosfs_conv.c,v 1.6.2.1 1994/08/30 02:27:57 cgd Exp $	*/
 
 /*
  * Written by Paul Popelka (paulp@uts.amdahl.com)
- * 
+ *
  * You can do anything you want with this software, just don't say you wrote
  * it, and don't remove this notice.
- * 
+ *
  * This software is provided "as is".
- * 
+ *
  * The author supplies this software to be publicly redistributed on the
  * understanding that the author is not responsible for the correct
  * functioning of this software in any circumstances and is not liable for
  * any damages caused by this software.
- * 
+ *
  * October 1992
  */
 
diff --git a/sys/fs/msdosfs/msdosfs_denode.c b/sys/fs/msdosfs/msdosfs_denode.c
index c0e882394538..60a68111833d 100644
--- a/sys/fs/msdosfs/msdosfs_denode.c
+++ b/sys/fs/msdosfs/msdosfs_denode.c
@@ -1,4 +1,4 @@
-/*	$Id: msdosfs_denode.c,v 1.10 1995/03/19 12:11:13 davidg Exp $ */
+/*	$Id: msdosfs_denode.c,v 1.11 1995/04/11 17:13:17 bde Exp $ */
 /*	$NetBSD: msdosfs_denode.c,v 1.9 1994/08/21 18:44:00 ws Exp $	*/
 
 /*-
@@ -34,17 +34,17 @@
  */
 /*
  * Written by Paul Popelka (paulp@uts.amdahl.com)
- * 
+ *
  * You can do anything you want with this software, just don't say you wrote
  * it, and don't remove this notice.
- * 
+ *
  * This software is provided "as is".
- * 
+ *
  * The author supplies this software to be publicly redistributed on the
  * understanding that the author is not responsible for the correct
  * functioning of this software in any circumstances and is not liable for
  * any damages caused by this software.
- * 
+ *
  * October 1992
  */
 
@@ -83,7 +83,7 @@ msdosfs_hashget(dev, dirclust, diroff)
 	u_long diroff;
 {
 	struct denode *dep;
-	
+
 	for (;;)
 		for (dep = dehashtbl[DEHASH(dev, dirclust + diroff)];;
 		     dep = dep->de_next) {
@@ -111,7 +111,7 @@ msdosfs_hashins(dep)
 	struct denode *dep;
 {
 	struct denode **depp, *deq;
-	
+
 	depp = &dehashtbl[DEHASH(dep->de_dev, dep->de_dirclust + dep->de_diroffset)];
 	deq = *depp;
 	if (deq)
@@ -137,17 +137,17 @@ msdosfs_hashrem(dep)
 }
 
 /*
- * If deget() succeeds it returns with the gotten denode locked(). 
+ * If deget() succeeds it returns with the gotten denode locked().
  *
  * pmp	     - address of msdosfsmount structure of the filesystem containing
  *	       the denode of interest.  The pm_dev field and the address of
- *	       the msdosfsmount structure are used. 
+ *	       the msdosfsmount structure are used.
  * dirclust  - which cluster bp contains, if dirclust is 0 (root directory)
  *	       diroffset is relative to the beginning of the root directory,
- *	       otherwise it is cluster relative. 
- * diroffset - offset past begin of cluster of denode we want 
+ *	       otherwise it is cluster relative.
+ * diroffset - offset past begin of cluster of denode we want
  * direntptr - address of the direntry structure of interest. If direntptr is
- *	       NULL, the block is read if necessary. 
+ *	       NULL, the block is read if necessary.
  * depp	     - returns the address of the gotten denode.
  */
 int
@@ -187,7 +187,7 @@ deget(pmp, dirclust, diroffset, direntptr, depp)
 	 * the directory entry to compute the hash value. For subdir use
 	 * address of "." entry. for root dir use cluster MSDOSFSROOT,
 	 * offset MSDOSFSROOT_OFS
-	 * 
+	 *
 	 * NOTE: The check for de_refcnt > 0 below insures the denode being
 	 * examined does not represent an unlinked but still open file.
 	 * These files are not to be accessible even when the directory
@@ -337,7 +337,7 @@ deupdat(dep, tp, waitfor)
 	 * update.
 	 */
 	error = readde(dep, &bp, &dirp);
-	if (error) 
+	if (error)
 		return error;
 
 	/*
@@ -535,7 +535,7 @@ deextend(dep, length, cred)
 	u_long count;
 	int error;
 	struct timespec ts;
-	
+
 	/*
 	 * The root of a DOS filesystem cannot be extended.
 	 */
@@ -554,7 +554,7 @@ deextend(dep, length, cred)
 
 	if (length <= dep->de_FileSize)
 		panic("deextend: file too large");
-	
+
 	/*
 	 * Compute the number of clusters to allocate.
 	 */
@@ -569,7 +569,7 @@ deextend(dep, length, cred)
 			return error;
 		}
 	}
-		
+
 	dep->de_flag |= DE_UPDATE;
 	dep->de_FileSize = length;
 	TIMEVAL_TO_TIMESPEC(&time, &ts);
@@ -606,7 +606,7 @@ msdosfs_reclaim(ap)
 {
 	struct vnode *vp = ap->a_vp;
 	struct denode *dep = VTODE(vp);
-	
+
 #ifdef MSDOSFS_DEBUG
 	printf("msdosfs_reclaim(): dep %p, file %s, refcnt %ld\n",
 	    dep, dep->de_Name, dep->de_refcnt);
@@ -630,10 +630,10 @@ msdosfs_reclaim(ap)
 	}
 
 	dep->de_flag = 0;
-	
+
 	FREE(dep, M_MSDOSFSNODE);
 	vp->v_data = NULL;
-	
+
 	return 0;
 }
 
@@ -647,7 +647,7 @@ msdosfs_inactive(ap)
 	struct denode *dep = VTODE(vp);
 	int error = 0;
 	struct timespec ts;
-	
+
 #ifdef MSDOSFS_DEBUG
 	printf("msdosfs_inactive(): dep %p, de_Name[0] %x\n", dep, dep->de_Name[0]);
 #endif
diff --git a/sys/fs/msdosfs/msdosfs_fat.c b/sys/fs/msdosfs/msdosfs_fat.c
index 06b30e460c4b..b43f9595b6b5 100644
--- a/sys/fs/msdosfs/msdosfs_fat.c
+++ b/sys/fs/msdosfs/msdosfs_fat.c
@@ -1,4 +1,4 @@
-/*	$Id: msdosfs_fat.c,v 1.5 1995/02/10 18:39:45 bde Exp $ */
+/*	$Id: msdosfs_fat.c,v 1.6 1995/04/11 16:43:20 bde Exp $ */
 /*	$NetBSD: msdosfs_fat.c,v 1.12 1994/08/21 18:44:04 ws Exp $	*/
 
 /*-
@@ -34,17 +34,17 @@
  */
 /*
  * Written by Paul Popelka (paulp@uts.amdahl.com)
- * 
+ *
  * You can do anything you want with this software, just don't say you wrote
  * it, and don't remove this notice.
- * 
+ *
  * This software is provided "as is".
- * 
+ *
  * The author supplies this software to be publicly redistributed on the
  * understanding that the author is not responsible for the correct
  * functioning of this software in any circumstances and is not liable for
  * any damages caused by this software.
- * 
+ *
  * October 1992
  */
 
@@ -251,7 +251,7 @@ hiteof:;
  * Find the closest entry in the fat cache to the cluster we are looking
  * for.
  */
-void 
+void
 fc_lookup(dep, findcn, frcnp, fsrcnp)
 	struct denode *dep;
 	u_long findcn;
@@ -344,22 +344,22 @@ updatefats(pmp, bp, fatbn)
 
 /*
  * Updating entries in 12 bit fats is a pain in the butt.
- * 
+ *
  * The following picture shows where nibbles go when moving from a 12 bit
  * cluster number into the appropriate bytes in the FAT.
- * 
+ *
  *	byte m        byte m+1      byte m+2
  *	+----+----+   +----+----+   +----+----+
  *	|  0    1 |   |  2    3 |   |  4    5 |   FAT bytes
  *	+----+----+   +----+----+   +----+----+
- * 
+ *
  *	+----+----+----+   +----+----+----+
  *	|  3    0    1 |   |  4    5    2 |
  *	+----+----+----+   +----+----+----+
  *	cluster n  	   cluster n+1
- * 
+ *
  * Where n is even. m = n + (n >> 2)
- * 
+ *
  */
 static inline void
 usemap_alloc(pmp, cn)
@@ -414,10 +414,10 @@ clusterfree(pmp, cluster, oldcnp)
  *		  cluster'th entry if this is a get function
  * newcontents	- the new value to be written into the cluster'th element of
  *		  the fat if this is a set function.
- * 
+ *
  * This function can also be used to free a cluster by setting the fat entry
  * for a cluster to 0.
- * 
+ *
  * All copies of the fat are updated if this is a set function. NOTE: If
  * fatentry() marks a cluster as free it does not update the inusemap in
  * the msdosfsmount structure. This is left to the caller.
@@ -470,7 +470,7 @@ fatentry(function, pmp, cn, oldcontents, newcontents)
 	error = bread(pmp->pm_devvp, bn, bsize, NOCRED, &bp);
 	if (error)
 		return error;
-	
+
 	if (function & FAT_GET) {
 		readcn = getushort(&bp->b_data[bo]);
 		if (FAT12(pmp)) {
@@ -523,7 +523,7 @@ fatchain(pmp, start, count, fillwith)
 	int error;
 	u_long bn, bo, bsize, byteoffset, readcn, newc;
 	struct buf *bp;
-	
+
 #ifdef MSDOSFS_DEBUG
 	printf("fatchain(pmp %p, start %ld, count %ld, fillwith %ld)\n",
 	       pmp, start, count, fillwith);
@@ -533,7 +533,7 @@ fatchain(pmp, start, count, fillwith)
 	 */
 	if (start < CLUST_FIRST || start + count - 1 > pmp->pm_maxcluster)
 		return EINVAL;
-	
+
 	while (count > 0) {
 		byteoffset = FATOFS(pmp, start);
 		fatblock(pmp, byteoffset, &bn, &bsize, &bo);
@@ -585,7 +585,7 @@ chainlength(pmp, start, count)
 	u_long idx, max_idx;
 	u_int map;
 	u_long len;
-	
+
 	max_idx = pmp->pm_maxcluster / N_INUSEBITS;
 	idx = start / N_INUSEBITS;
 	start %= N_INUSEBITS;
@@ -632,7 +632,7 @@ chainalloc(pmp, start, count, fillwith, retcluster, got)
 	u_long *got;
 {
 	int error;
-	
+
 	error = fatchain(pmp, start, count, fillwith);
 	if (error == 0) {
 #ifdef MSDOSFS_DEBUG
@@ -672,7 +672,7 @@ clusteralloc(pmp, start, count, fillwith, retcluster, got)
 	u_long idx;
 	u_long len, newst, foundcn, foundl, cn, l;
 	u_int map;
-	
+
 #ifdef MSDOSFS_DEBUG
 	printf("clusteralloc(): find %d clusters\n",count);
 #endif
@@ -684,19 +684,19 @@ clusteralloc(pmp, start, count, fillwith, retcluster, got)
 		 * This is a new file, initialize start
 		 */
 		struct timeval tv;
-		
+
 		microtime(&tv);
 		start = (tv.tv_usec >> 10)|tv.tv_usec;
 		len = 0;
 	}
-	
+
 	/*
 	 * Start at a (pseudo) random place to maximize cluster runs
 	 * under multiple writers.
 	 */
 	foundcn = newst = (start * 1103515245 + 12345) % (pmp->pm_maxcluster + 1);
 	foundl = 0;
-	
+
 	for (cn = newst; cn <= pmp->pm_maxcluster;) {
 		idx = cn / N_INUSEBITS;
 		map = pmp->pm_inusemap[idx];
@@ -759,7 +759,7 @@ freeclusterchain(pmp, cluster)
 	struct buf *bp = NULL;
 	u_long bn, bo, bsize, byteoffset;
 	u_long readcn, lbn = -1;
-	
+
 	while (cluster >= CLUST_FIRST && cluster <= pmp->pm_maxcluster) {
 		byteoffset = FATOFS(pmp, cluster);
 		fatblock(pmp, byteoffset, &bn, &bsize, &bo);
@@ -878,7 +878,7 @@ extendfile(dep, count, bpp, ncp, flags)
 	u_long cn, got;
 	struct msdosfsmount *pmp = dep->de_pmp;
 	struct buf *bp;
-	
+
 	/*
 	 * Don't try to extend the root directory
 	 */
@@ -901,7 +901,7 @@ extendfile(dep, count, bpp, ncp, flags)
 			return error;
 		error = 0;
 	}
-	
+
 	while (count > 0) {
 		/*
 		 * Allocate a new cluster chain and cat onto the end of the file.
@@ -918,9 +918,9 @@ extendfile(dep, count, bpp, ncp, flags)
 		error = clusteralloc(pmp, cn, count, CLUST_EOFE, &cn, &got);
 		if (error)
 			return error;
-		
+
 		count -= got;
-		
+
 		/*
 		 * Give them the filesystem relative cluster number if they want
 		 * it.
@@ -929,7 +929,7 @@ extendfile(dep, count, bpp, ncp, flags)
 			*ncp = cn;
 			ncp = NULL;
 		}
-		
+
 		if (dep->de_StartCluster == 0) {
 			dep->de_StartCluster = cn;
 			frcn = 0;
@@ -940,16 +940,16 @@ extendfile(dep, count, bpp, ncp, flags)
 				clusterfree(pmp, cn, NULL);
 				return error;
 			}
-			
+
 			frcn = dep->de_fc[FC_LASTFC].fc_frcn + 1;
 		}
-		
+
 		/*
 		 * Update the "last cluster of the file" entry in the denode's fat
 		 * cache.
 		 */
 		fc_setcache(dep, FC_LASTFC, frcn + got - 1, cn + got - 1);
-		
+
 		if (flags & DE_CLEAR) {
 			while (got-- > 0) {
 				/*
@@ -979,6 +979,6 @@ extendfile(dep, count, bpp, ncp, flags)
 			}
 		}
 	}
-	
+
 	return 0;
 }
diff --git a/sys/fs/msdosfs/msdosfs_lookup.c b/sys/fs/msdosfs/msdosfs_lookup.c
index 5e9cbca13422..a80e5ae7bac3 100644
--- a/sys/fs/msdosfs/msdosfs_lookup.c
+++ b/sys/fs/msdosfs/msdosfs_lookup.c
@@ -1,4 +1,4 @@
-/*	$Id: msdosfs_lookup.c,v 1.2 1994/09/27 20:42:51 phk Exp $ */
+/*	$Id: msdosfs_lookup.c,v 1.3 1995/05/09 16:30:44 bde Exp $ */
 /*	$NetBSD: msdosfs_lookup.c,v 1.14 1994/08/21 18:44:07 ws Exp $	*/
 
 /*-
@@ -34,17 +34,17 @@
  */
 /*
  * Written by Paul Popelka (paulp@uts.amdahl.com)
- * 
+ *
  * You can do anything you want with this software, just don't say you wrote
  * it, and don't remove this notice.
- * 
+ *
  * This software is provided "as is".
- * 
+ *
  * The author supplies this software to be publicly redistributed on the
  * understanding that the author is not responsible for the correct
  * functioning of this software in any circumstances and is not liable for
  * any damages caused by this software.
- * 
+ *
  * October 1992
  */
 
diff --git a/sys/fs/msdosfs/msdosfs_vfsops.c b/sys/fs/msdosfs/msdosfs_vfsops.c
index 4a765b98359b..bbb4fc6d2769 100644
--- a/sys/fs/msdosfs/msdosfs_vfsops.c
+++ b/sys/fs/msdosfs/msdosfs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$Id: msdosfs_vfsops.c,v 1.5 1994/10/02 17:48:21 phk Exp $ */
+/*	$Id: msdosfs_vfsops.c,v 1.6 1994/12/12 12:35:47 bde Exp $ */
 /*	$NetBSD: msdosfs_vfsops.c,v 1.19 1994/08/21 18:44:10 ws Exp $	*/
 
 /*-
@@ -34,17 +34,17 @@
  */
 /*
  * Written by Paul Popelka (paulp@uts.amdahl.com)
- * 
+ *
  * You can do anything you want with this software, just don't say you wrote
  * it, and don't remove this notice.
- * 
+ *
  * This software is provided "as is".
- * 
+ *
  * The author supplies this software to be publicly redistributed on the
  * understanding that the author is not responsible for the correct
  * functioning of this software in any circumstances and is not liable for
  * any damages caused by this software.
- * 
+ *
  * October 1992
  */
 
@@ -70,9 +70,9 @@
 int msdosfsdoforce = 1;		/* 1 = force unmount */
 
 /*
- * mp - path - addr in user space of mount point (ie /usr or whatever) 
+ * mp - path - addr in user space of mount point (ie /usr or whatever)
  * data - addr in user space of mount params including the name of the block
- * special file to treat as a filesystem. 
+ * special file to treat as a filesystem.
  */
 int
 msdosfs_mount(mp, path, data, ndp, p)
@@ -169,7 +169,7 @@ msdosfs_mount(mp, path, data, ndp, p)
 	crfree(cred);					/* XXX */
 	if (error != 0)
 		return error;
-	
+
 	/*
 	 * Be sure they've given us a block device to treat as a
 	 * filesystem.  And, that its major number is within the bdevsw
diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c
index 0993c9d6379c..047eea0bcb0f 100644
--- a/sys/fs/msdosfs/msdosfs_vnops.c
+++ b/sys/fs/msdosfs/msdosfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$Id: msdosfs_vnops.c,v 1.14 1995/04/11 18:32:17 ache Exp $ */
+/*	$Id: msdosfs_vnops.c,v 1.15 1995/05/09 16:30:45 bde Exp $ */
 /*	$NetBSD: msdosfs_vnops.c,v 1.20 1994/08/21 18:44:13 ws Exp $	*/
 
 /*-
@@ -34,17 +34,17 @@
  */
 /*
  * Written by Paul Popelka (paulp@uts.amdahl.com)
- * 
+ *
  * You can do anything you want with this software, just don't say you wrote
  * it, and don't remove this notice.
- * 
+ *
  * This software is provided "as is".
- * 
+ *
  * The author supplies this software to be publicly redistributed on the
  * understanding that the author is not responsible for the correct
  * functioning of this software in any circumstances and is not liable for
  * any damages caused by this software.
- * 
+ *
  * October 1992
  */
 
@@ -73,7 +73,7 @@
 #include <msdosfs/fat.h>
 /*
  * Some general notes:
- * 
+ *
  * In the ufs filesystem the inodes, superblocks, and indirect blocks are
  * read/written using the vnode for the filesystem. Blocks that represent
  * the contents of a file are read/written using the vnode for the file
@@ -156,7 +156,7 @@ msdosfs_mknod(ap)
 	} */ *ap;
 {
 	int error;
-	
+
 	switch (ap->a_vap->va_type) {
 	case VDIR:
 		error = msdosfs_mkdir((struct vop_mkdir_args *)ap);
@@ -222,13 +222,13 @@ vaccess(file_mode, uid, gid, acc_mode, cred)
 	mode_t mask;
 	int i;
 	register gid_t *gp;
-	
+
 	/* User id 0 always gets access. */
 	if (cred->cr_uid == 0)
 		return 0;
-	
+
 	mask = 0;
-	
+
 	/* Otherwise, check the owner. */
 	if (cred->cr_uid == uid) {
 		if (acc_mode & VEXEC)
@@ -239,7 +239,7 @@ vaccess(file_mode, uid, gid, acc_mode, cred)
 			mask |= S_IWUSR;
 		return (file_mode & mask) == mask ? 0 : EACCES;
 	}
-	
+
 	/* Otherwise, check the groups. */
 	for (i = 0, gp = cred->cr_groups; i < cred->cr_ngroups; i++, gp++)
 		if (gid == *gp) {
@@ -251,7 +251,7 @@ vaccess(file_mode, uid, gid, acc_mode, cred)
 				mask |= S_IWGRP;
 			return (file_mode & mask) == mask ? 0 : EACCES;
 		}
-	
+
 	/* Otherwise, check everyone else. */
 	if (acc_mode & VEXEC)
 		mask |= S_IXOTH;
@@ -274,11 +274,11 @@ msdosfs_access(ap)
 	mode_t dosmode;
 	struct denode *dep = VTODE(ap->a_vp);
 	struct msdosfsmount *pmp = dep->de_pmp;
-	
+
 	dosmode = (S_IXUSR|S_IXGRP|S_IXOTH) | (S_IRUSR|S_IRGRP|S_IROTH) |
 	    ((dep->de_Attributes & ATTR_READONLY) ? 0 : (S_IWUSR|S_IWGRP|S_IWOTH));
 	dosmode &= pmp->pm_mask;
-	
+
 	return vaccess(dosmode, pmp->pm_uid, pmp->pm_gid, ap->a_mode, ap->a_cred);
 }
 
@@ -352,7 +352,7 @@ msdosfs_setattr(ap)
 	struct denode *dep = VTODE(ap->a_vp);
 	struct vattr *vap = ap->a_vap;
 	struct ucred *cred = ap->a_cred;
-	
+
 #ifdef MSDOSFS_DEBUG
 	printf("msdosfs_setattr(): vp %08x, vap %08x, cred %08x, p %08x\n",
 	       ap->a_vp, vap, cred, ap->a_p);
@@ -396,7 +396,7 @@ msdosfs_setattr(ap)
 	if (vap->va_mtime.ts_sec != VNOVAL) {
 		if (cred->cr_uid != dep->de_pmp->pm_uid &&
 		    (error = suser(cred, &ap->a_p->p_acflag)) &&
-		    ((vap->va_vaflags & VA_UTIMES_NULL) == 0 || 
+		    ((vap->va_vaflags & VA_UTIMES_NULL) == 0 ||
 		    (error = VOP_ACCESS(ap->a_vp, VWRITE, cred, &ap->a_p))))
 			return error;
 		dep->de_flag |= DE_UPDATE;
@@ -574,7 +574,7 @@ msdosfs_write(ap)
 	struct msdosfsmount *pmp = dep->de_pmp;
 	struct ucred *cred = ap->a_cred;
 	struct timespec ts;
-	
+
 #ifdef MSDOSFS_DEBUG
 	printf("msdosfs_write(vp %08x, uio %08x, ioflag %08x, cred %08x\n",
 	       vp, uio, ioflag, cred);
@@ -658,7 +658,7 @@ msdosfs_write(ap)
 		lastcn = dep->de_fc[FC_LASTFC].fc_frcn;
 	} else
 		lastcn = de_clcount(pmp, osize) - 1;
-	
+
 	do {
 		bn = de_blk(pmp, uio->uio_offset);
 		if (isadir) {
@@ -669,7 +669,7 @@ msdosfs_write(ap)
 			error = ENOSPC;
 			break;
 		}
-		
+
 		if ((uio->uio_offset & pmp->pm_crbomask) == 0
 		    && (de_blk(pmp, uio->uio_offset + uio->uio_resid) > de_blk(pmp, uio->uio_offset)
 			|| uio->uio_offset + uio->uio_resid >= dep->de_FileSize)) {
@@ -687,7 +687,7 @@ msdosfs_write(ap)
 			if (!isadir) {
 				if (bp->b_blkno == bp->b_lblkno) {
 					error = pcbmap(dep, bp->b_lblkno,
-							   &bp->b_blkno, 0); 
+							   &bp->b_blkno, 0);
 					if (error)
 						bp->b_blkno = -1;
 				}
@@ -802,7 +802,7 @@ msdosfs_mmap(ap)
 
 /*
  * Flush the blocks of a file to disk.
- * 
+ *
  * This function is worthless for vnodes that represent directories. Maybe we
  * could just do a sync if they try an fsync on a directory file.
  */
@@ -917,9 +917,9 @@ msdosfs_link(ap)
  * Renames on files require moving the denode to a new hash queue since the
  * denode's location is used to compute which hash queue to put the file
  * in. Unless it is a rename in place.  For example "mv a b".
- * 
+ *
  * What follows is the basic algorithm:
- * 
+ *
  * if (file move) {
  *	if (dest file exists) {
  *		remove dest file
@@ -951,13 +951,13 @@ msdosfs_link(ap)
  *		clear old directory entry for moved directory
  *	}
  * }
- * 
+ *
  * On entry:
  *	source's parent directory is unlocked
  *	source file or directory is unlocked
  *	destination's parent directory is locked
  *	destination file or directory is locked if it exists
- * 
+ *
  * On exit:
  *	all denodes should be released
  *
@@ -1646,7 +1646,7 @@ msdosfs_readdir(ap)
 				ncookies++;
 			}
 			dentp++;
-			
+
 			crnt = (struct dirent *) ((char *) crnt + sizeof(struct direntry));
 			pushout = 1;
 
@@ -1722,7 +1722,7 @@ out:	;
 			*ap->a_eofflag = 1;
 		else
 			*ap->a_eofflag = 0;
-	
+
 	return error;
 }
 
diff --git a/sys/fs/msdosfs/msdosfsmount.h b/sys/fs/msdosfs/msdosfsmount.h
index 270b5b4b4d5b..5309acbd0851 100644
--- a/sys/fs/msdosfs/msdosfsmount.h
+++ b/sys/fs/msdosfs/msdosfsmount.h
@@ -1,4 +1,4 @@
-/*	$Id: msdosfsmount.h,v 1.1 1994/09/19 15:41:48 dfr Exp $ */
+/*	$Id: msdosfsmount.h,v 1.2 1994/09/27 20:42:59 phk Exp $ */
 /*	$NetBSD: msdosfsmount.h,v 1.7 1994/08/21 18:44:17 ws Exp $	*/
 
 /*-
@@ -34,17 +34,17 @@
  */
 /*
  * Written by Paul Popelka (paulp@uts.amdahl.com)
- * 
+ *
  * You can do anything you want with this software, just don't say you wrote
  * it, and don't remove this notice.
- * 
+ *
  * This software is provided "as is".
- * 
+ *
  * The author supplies this software to be publicly redistributed on the
  * understanding that the author is not responsible for the correct
  * functioning of this software in any circumstances and is not liable for
  * any damages caused by this software.
- * 
+ *
  * October 1992
  */
 
@@ -88,19 +88,19 @@ struct msdosfsmount {
 
 /*
  * How to compute pm_cnshift and pm_crbomask.
- * 
- * pm_crbomask = (pm_SectPerClust * pm_BytesPerSect) - 1 
- * if (bytesperclust == * 0) 
- * 	return EBADBLKSZ; 
- * bit = 1; 
- * for (i = 0; i < 32; i++) { 
- *	if (bit & bytesperclust) { 
- *		if (bit ^ bytesperclust) 
- *			return EBADBLKSZ; 
- *		pm_cnshift = * i; 
- *		break; 
- *	} 
- *	bit <<= 1; 
+ *
+ * pm_crbomask = (pm_SectPerClust * pm_BytesPerSect) - 1
+ * if (bytesperclust == * 0)
+ * 	return EBADBLKSZ;
+ * bit = 1;
+ * for (i = 0; i < 32; i++) {
+ *	if (bit & bytesperclust) {
+ *		if (bit ^ bytesperclust)
+ *			return EBADBLKSZ;
+ *		pm_cnshift = * i;
+ *		break;
+ *	}
+ *	bit <<= 1;
  * }
  */
 
diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c
index 9b7e9da46118..eb1a19231c7d 100644
--- a/sys/fs/nullfs/null_vfsops.c
+++ b/sys/fs/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/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c
index 9136baf78da5..464d15aa6246 100644
--- a/sys/fs/nullfs/null_vnops.c
+++ b/sys/fs/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/fs/portalfs/portal_vfsops.c b/sys/fs/portalfs/portal_vfsops.c
index 130f99177174..52c7bcf6094e 100644
--- a/sys/fs/portalfs/portal_vfsops.c
+++ b/sys/fs/portalfs/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/fs/portalfs/portal_vnops.c b/sys/fs/portalfs/portal_vnops.c
index 56f52fb481bf..41fd2de3f416 100644
--- a/sys/fs/portalfs/portal_vnops.c
+++ b/sys/fs/portalfs/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/fs/procfs/procfs_mem.c b/sys/fs/procfs/procfs_mem.c
index f55e5e3109ef..0f1b3b02f96d 100644
--- a/sys/fs/procfs/procfs_mem.c
+++ b/sys/fs/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/fs/procfs/procfs_status.c b/sys/fs/procfs/procfs_status.c
index c74cde9c8f65..f1290222d06b 100644
--- a/sys/fs/procfs/procfs_status.c
+++ b/sys/fs/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/fs/procfs/procfs_subr.c b/sys/fs/procfs/procfs_subr.c
index e1cfdf3b7716..6c464c1bdb77 100644
--- a/sys/fs/procfs/procfs_subr.c
+++ b/sys/fs/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/fs/procfs/procfs_vnops.c b/sys/fs/procfs/procfs_vnops.c
index 8decad4f8bed..738df27cadf9 100644
--- a/sys/fs/procfs/procfs_vnops.c
+++ b/sys/fs/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/fs/umapfs/umap.h b/sys/fs/umapfs/umap.h
index 5903d30e3fa1..5be2e5eed466 100644
--- a/sys/fs/umapfs/umap.h
+++ b/sys/fs/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/fs/umapfs/umap_subr.c b/sys/fs/umapfs/umap_subr.c
index 4b2aad4ba01a..792f4a87b05e 100644
--- a/sys/fs/umapfs/umap_subr.c
+++ b/sys/fs/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/fs/umapfs/umap_vfsops.c b/sys/fs/umapfs/umap_vfsops.c
index a98ae18d6758..64f05bbd62d6 100644
--- a/sys/fs/umapfs/umap_vfsops.c
+++ b/sys/fs/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/fs/umapfs/umap_vnops.c b/sys/fs/umapfs/umap_vnops.c
index 14d3fcc48266..a82d1c6d327b 100644
--- a/sys/fs/umapfs/umap_vnops.c
+++ b/sys/fs/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/fs/unionfs/union_subr.c b/sys/fs/unionfs/union_subr.c
index 02f7a1068e9b..cbbd17111bbc 100644
--- a/sys/fs/unionfs/union_subr.c
+++ b/sys/fs/unionfs/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/fs/unionfs/union_vfsops.c b/sys/fs/unionfs/union_vfsops.c
index c9e2c60874f4..670c7ce98d90 100644
--- a/sys/fs/unionfs/union_vfsops.c
+++ b/sys/fs/unionfs/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);
 }