Remove trailing whitespace.

21 files changed, 98 insertions, 98 deletions

diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c
index 1e9ce49..d91c557 100644
--- a/sys/ufs/ffs/ffs_alloc.c
+++ b/sys/ufs/ffs/ffs_alloc.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_alloc.c	8.8 (Berkeley) 2/21/94
- * $Id: ffs_alloc.c,v 1.12 1995/03/26 23:29:09 davidg Exp $
+ * $Id: ffs_alloc.c,v 1.13 1995/05/11 19:26:48 rgrimes Exp $
  */
 
 #include <sys/param.h>
@@ -69,7 +69,7 @@ void		ffs_clusteracct	__P((struct fs *, struct cg *, daddr_t, int));
 
 /*
  * Allocate a block in the file system.
- * 
+ *
  * The size of the requested block is given, which must be some
  * multiple of fs_fsize and <= fs_bsize.
  * A preference may be optionally specified. If a preference is given
@@ -100,8 +100,8 @@ ffs_alloc(ip, lbn, bpref, size, cred, bnp)
 #ifdef QUOTA
 	int error;
 #endif
-	
-	
+
+
 	*bnp = 0;
 	fs = ip->i_fs;
 #ifdef DIAGNOSTIC
@@ -169,7 +169,7 @@ ffs_realloccg(ip, lbprev, bpref, osize, nsize, cred, bpp)
 	struct buf *bp;
 	int cg, request, error;
 	daddr_t bprev, bno;
-	
+
 	*bpp = 0;
 	fs = ip->i_fs;
 #ifdef DIAGNOSTIC
@@ -206,7 +206,7 @@ ffs_realloccg(ip, lbprev, bpref, osize, nsize, cred, bpp)
 			panic("ffs_realloccg: lbprev out of range");
 		bp->b_blkno = fsbtodb(fs, bprev);
 	}
-		
+
 #ifdef QUOTA
 	error = chkdq(ip, (long)btodb(nsize - osize), cred, 0);
 	if (error) {
@@ -238,8 +238,8 @@ ffs_realloccg(ip, lbprev, bpref, osize, nsize, cred, bpp)
 	switch ((int)fs->fs_optim) {
 	case FS_OPTSPACE:
 		/*
-		 * Allocate an exact sized fragment. Although this makes 
-		 * best use of space, we will waste time relocating it if 
+		 * Allocate an exact sized fragment. Although this makes
+		 * best use of space, we will waste time relocating it if
 		 * the file continues to grow. If the fragmentation is
 		 * less than half of the minimum free reserve, we choose
 		 * to begin optimizing for time.
@@ -432,7 +432,7 @@ ffs_reallocblks(ap)
 	 * Next we must write out the modified inode and indirect blocks.
 	 * For strict correctness, the writes should be synchronous since
 	 * the old block values may have been written to disk. In practise
-	 * they are almost never written, but if we are concerned about 
+	 * they are almost never written, but if we are concerned about
 	 * strict correctness, the `doasyncfree' flag should be set to zero.
 	 *
 	 * The test on `doasyncfree' should be changed to test a flag
@@ -477,7 +477,7 @@ fail:
 
 /*
  * Allocate an inode in the file system.
- * 
+ *
  * If allocating a directory, use ffs_dirpref to select the inode.
  * If allocating in a directory, the following hierarchy is followed:
  *   1) allocate the preferred inode.
@@ -506,7 +506,7 @@ ffs_valloc(ap)
 	mode_t mode = ap->a_mode;
 	ino_t ino, ipref;
 	int cg, error;
-	
+
 	*ap->a_vpp = NULL;
 	pip = VTOI(pvp);
 	fs = pip->i_fs;
@@ -582,7 +582,7 @@ ffs_dirpref(fs)
  * Select the desired position for the next block in a file.  The file is
  * logically divided into sections. The first section is composed of the
  * direct blocks. Each additional section contains fs_maxbpg blocks.
- * 
+ *
  * If no blocks have been allocated in the first section, the policy is to
  * request a block in the same cylinder group as the inode that describes
  * the file. If no blocks have been allocated in any other section, the
@@ -596,7 +596,7 @@ ffs_dirpref(fs)
  * indirect block, the information on the previous allocation is unavailable;
  * here a best guess is made based upon the logical block number being
  * allocated.
- * 
+ *
  * If a section is already partially allocated, the policy is to
  * contiguously allocate fs_maxcontig blocks.  The end of one of these
  * contiguous blocks and the beginning of the next is physically separated
@@ -726,7 +726,7 @@ ffs_hashalloc(ip, cg, pref, size, allocator)
 /*
  * Determine whether a fragment can be extended.
  *
- * Check to see if the necessary fragments are available, and 
+ * Check to see if the necessary fragments are available, and
  * if they are, allocate them.
  */
 static daddr_t
@@ -844,7 +844,7 @@ ffs_alloccg(ip, cg, bpref, size)
 			break;
 	if (allocsiz == fs->fs_frag) {
 		/*
-		 * no fragments were available, so a block will be 
+		 * no fragments were available, so a block will be
 		 * allocated, and hacked up
 		 */
 		if (cgp->cg_cs.cs_nbfree == 0) {
@@ -921,7 +921,7 @@ ffs_alloccgblk(fs, cgp, bpref)
 		/*
 		 * Block layout information is not available.
 		 * Leaving bpref unchanged means we take the
-		 * next available free block following the one 
+		 * next available free block following the one
 		 * we just allocated. Hopefully this will at
 		 * least hit a track cache on drives of unknown
 		 * geometry (e.g. SCSI).
@@ -935,7 +935,7 @@ ffs_alloccgblk(fs, cgp, bpref)
 	if (cg_blktot(cgp)[cylno] == 0)
 		goto norot;
 	/*
-	 * check the summary information to see if a block is 
+	 * check the summary information to see if a block is
 	 * available in the requested cylinder starting at the
 	 * requested rotational position and proceeding around.
 	 */
@@ -1172,7 +1172,7 @@ gotit:
  * Free a block or fragment.
  *
  * The specified block or fragment is placed back in the
- * free map. If a fragment is deallocated, a possible 
+ * free map. If a fragment is deallocated, a possible
  * block reassembly is checked.
  */
 void
@@ -1486,7 +1486,7 @@ ffs_clusteracct(fs, cgp, blkno, cnt)
 
 /*
  * Fserr prints the name of a file system with an error diagnostic.
- * 
+ *
  * The form of the error message is:
  *	fs: error message
  */
diff --git a/sys/ufs/ffs/ffs_balloc.c b/sys/ufs/ffs/ffs_balloc.c
index 687781e..cbe9c60 100644
--- a/sys/ufs/ffs/ffs_balloc.c
+++ b/sys/ufs/ffs/ffs_balloc.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_balloc.c	8.4 (Berkeley) 9/23/93
- * $Id: ffs_balloc.c,v 1.7 1995/04/09 06:03:36 davidg Exp $
+ * $Id: ffs_balloc.c,v 1.8 1995/05/28 04:32:23 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -174,7 +174,7 @@ ffs_balloc(ip, bn, size, cred, bpp, flags)
 	nb = ip->i_ib[indirs[0].in_off];
 	if (nb == 0) {
 		pref = ffs_blkpref(ip, lbn, 0, (daddr_t *)0);
-	        error = ffs_alloc(ip, lbn, pref, 
+	        error = ffs_alloc(ip, lbn, pref,
 			(int)fs->fs_bsize, cred, &newb);
 	        if (error)
 			return (error);
diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c
index 4a02c4b..cbf9652 100644
--- a/sys/ufs/ffs/ffs_subr.c
+++ b/sys/ufs/ffs/ffs_subr.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_subr.c	8.2 (Berkeley) 9/21/93
- * $Id: ffs_subr.c,v 1.2 1994/08/02 07:54:22 davidg Exp $
+ * $Id: ffs_subr.c,v 1.3 1994/10/10 01:04:38 phk Exp $
  */
 
 #include <sys/param.h>
@@ -84,7 +84,7 @@ ffs_blkatoff(ap)
 #endif
 
 /*
- * Update the frsum fields to reflect addition or deletion 
+ * Update the frsum fields to reflect addition or deletion
  * of some frags.
  */
 void
diff --git a/sys/ufs/ffs/ffs_tables.c b/sys/ufs/ffs/ffs_tables.c
index cc70ee1..089334f 100644
--- a/sys/ufs/ffs/ffs_tables.c
+++ b/sys/ufs/ffs/ffs_tables.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_tables.c	8.1 (Berkeley) 6/11/93
- * $Id$
+ * $Id: ffs_tables.c,v 1.2 1994/08/02 07:54:22 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -49,7 +49,7 @@ int inside[9] = {
 
 /*
  * Given a block map bit pattern, the frag tables tell whether a
- * particular size fragment is available. 
+ * particular size fragment is available.
  *
  * used as:
  * if ((1 << (size - 1)) & fragtbl[fs->fs_frag][map] {
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index a52ddd5..6622113 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_vfsops.c	8.8 (Berkeley) 4/18/94
- * $Id: ffs_vfsops.c,v 1.19 1995/05/15 08:39:37 davidg Exp $
+ * $Id: ffs_vfsops.c,v 1.20 1995/05/19 03:26:56 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -103,7 +103,7 @@ ffs_mountroot()
 	struct ufsmount *ump;
 	u_int size;
 	int error;
-	
+
 	/*
 	 * Get vnode for rootdev.
 	 */
@@ -246,7 +246,7 @@ ffs_mount(mp, path, data, ndp, p)
 	bzero(fs->fs_fsmnt + size, sizeof(fs->fs_fsmnt) - size);
 	bcopy((caddr_t)fs->fs_fsmnt, (caddr_t)mp->mnt_stat.f_mntonname,
 	    MNAMELEN);
-	(void) copyinstr(args.fspec, mp->mnt_stat.f_mntfromname, MNAMELEN - 1, 
+	(void) copyinstr(args.fspec, mp->mnt_stat.f_mntfromname, MNAMELEN - 1,
 	    &size);
 	bzero(mp->mnt_stat.f_mntfromname + size, MNAMELEN - size);
 	(void)ffs_statfs(mp, &mp->mnt_stat, p);
@@ -706,7 +706,7 @@ loop:
 						0, 0, 0);
 			vput(vp);
 		}
-			
+
 		if ((((ip->i_flag &
 		    (IN_ACCESS | IN_CHANGE | IN_MODIFIED | IN_UPDATE)) == 0)) &&
 		    vp->v_dirtyblkhd.lh_first == NULL)
diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c
index e2abd2b..c5209fc 100644
--- a/sys/ufs/ffs/ffs_vnops.c
+++ b/sys/ufs/ffs/ffs_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_vnops.c	8.7 (Berkeley) 2/3/94
- * $Id: ffs_vnops.c,v 1.9 1995/04/09 06:03:40 davidg Exp $
+ * $Id: ffs_vnops.c,v 1.10 1995/05/21 21:39:26 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -267,7 +267,7 @@ loop:
 			panic("ffs_fsync: not dirty");
 
 		if (bp->b_vp != vp || ap->a_waitfor != MNT_NOWAIT) {
-			
+
 			bremfree(bp);
 			bp->b_flags |= B_BUSY;
 			splx(s);
diff --git a/sys/ufs/ffs/fs.h b/sys/ufs/ffs/fs.h
index 0aa090a..41f204c 100644
--- a/sys/ufs/ffs/fs.h
+++ b/sys/ufs/ffs/fs.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fs.h	8.7 (Berkeley) 4/19/94
- * $Id: fs.h,v 1.3 1994/08/21 07:03:56 paul Exp $
+ * $Id: fs.h,v 1.4 1995/03/10 22:18:16 davidg Exp $
  */
 
 #ifndef _UFS_FFS_FS_H_
@@ -70,7 +70,7 @@
 
 /*
  * Addresses stored in inodes are capable of addressing fragments
- * of `blocks'. File system blocks of at most size MAXBSIZE can 
+ * of `blocks'. File system blocks of at most size MAXBSIZE can
  * be optionally broken into 2, 4, or 8 pieces, each of which is
  * addressible; these pieces may be DEV_BSIZE, or some multiple of
  * a DEV_BSIZE unit.
@@ -100,7 +100,7 @@
 
 /*
  * The path name on which the file system is mounted is maintained
- * in fs_fsmnt. MAXMNTLEN defines the amount of space allocated in 
+ * in fs_fsmnt. MAXMNTLEN defines the amount of space allocated in
  * the super block for this name.
  * The limit on the amount of summary information per file system
  * is defined by MAXCSBUFS. It is currently parameterized for a
@@ -224,7 +224,7 @@ struct fs {
 	long	fs_cpc;			/* cyl per cycle in postbl */
 	short	fs_opostbl[16][8];	/* old rotation block list head */
 	long	fs_sparecon[50];	/* reserved for future constants */
-	long	fs_contigsumsize;	/* size of cluster summary array */ 
+	long	fs_contigsumsize;	/* size of cluster summary array */
 	long	fs_maxsymlinklen;	/* max length of an internal symlink */
 	long	fs_inodefmt;		/* format of on-disk inodes */
 	u_quad_t fs_maxfilesize;	/* maximum representable file size */
@@ -272,7 +272,7 @@ struct fs {
 /*
  * The size of a cylinder group is calculated by CGSIZE. The maximum size
  * is limited by the fact that cylinder groups are at most one block.
- * Its size is derived from the size of the maps maintained in the 
+ * Its size is derived from the size of the maps maintained in the
  * cylinder group and the (struct cg) size.
  */
 #define CGSIZE(fs) \
diff --git a/sys/ufs/lfs/lfs.h b/sys/ufs/lfs/lfs.h
index 3a072a8..1ae1e23 100644
--- a/sys/ufs/lfs/lfs.h
+++ b/sys/ufs/lfs/lfs.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs.h	8.3 (Berkeley) 9/23/93
- * $Id: lfs.h,v 1.4 1994/10/10 01:04:47 phk Exp $
+ * $Id: lfs.h,v 1.5 1994/11/17 01:30:47 gibbs Exp $
  */
 
 #ifndef _UFS_LFS_LFS_H_
@@ -286,7 +286,7 @@ struct segsum {
  */
 #endif
 
-/* 
+/*
  * Determine if there is enough room currently available to write db
  * disk blocks.  We need enough blocks for the new blocks, the current,
  * inode blocks, a summary block, plus potentially the ifile inode and
diff --git a/sys/ufs/lfs/lfs_balloc.c b/sys/ufs/lfs/lfs_balloc.c
index 8491494..81fac0d 100644
--- a/sys/ufs/lfs/lfs_balloc.c
+++ b/sys/ufs/lfs/lfs_balloc.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs_balloc.c	8.1 (Berkeley) 6/11/93
- * $Id: lfs_balloc.c,v 1.5 1995/03/28 07:58:02 bde Exp $
+ * $Id: lfs_balloc.c,v 1.6 1995/04/09 06:03:41 davidg Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -68,7 +68,7 @@ lfs_balloc(vp, iosize, lbn, bpp)
 	ip = VTOI(vp);
 	fs = ip->i_lfs;
 
-	/* 
+	/*
 	 * Three cases: it's a block beyond the end of file, it's a block in
 	 * the file that may or may not have been assigned a disk address or
 	 * we're writing an entire block.  Note, if the daddr is unassigned,
@@ -114,7 +114,7 @@ lfs_balloc(vp, iosize, lbn, bpp)
 
 	/* Now, we may need to allocate the data block */
 	if (!(bp->b_flags & (B_CACHE | B_DONE | B_DELWRI))) {
-		if (daddr == UNASSIGNED) 
+		if (daddr == UNASSIGNED)
 			if (!ISSPACE(fs, bb, curproc->p_ucred)) {
 				bp->b_flags |= B_INVAL;
 				brelse(bp);
diff --git a/sys/ufs/lfs/lfs_cksum.c b/sys/ufs/lfs/lfs_cksum.c
index 8b70a40..b3f689c 100644
--- a/sys/ufs/lfs/lfs_cksum.c
+++ b/sys/ufs/lfs/lfs_cksum.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs_cksum.c	8.1 (Berkeley) 6/11/93
- * $Id$
+ * $Id: lfs_cksum.c,v 1.2 1994/08/02 07:54:32 davidg Exp $
  */
 
 #include <sys/types.h>
@@ -49,7 +49,7 @@ cksum(str, len)
 	register size_t len;
 {
 	register u_long sum;
-	
+
 	len &= ~(sizeof(u_short) - 1);
 	for (sum = 0; len; len -= sizeof(u_short)) {
 		sum ^= *(u_short *)str;
diff --git a/sys/ufs/lfs/lfs_debug.c b/sys/ufs/lfs/lfs_debug.c
index 5816c89..1edffbf 100644
--- a/sys/ufs/lfs/lfs_debug.c
+++ b/sys/ufs/lfs/lfs_debug.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs_debug.c	8.1 (Berkeley) 6/11/93
- * $Id$
+ * $Id: lfs_debug.c,v 1.2 1994/08/02 07:54:33 davidg Exp $
  */
 
 #ifdef DEBUG
@@ -45,7 +45,7 @@
 #include <ufs/lfs/lfs.h>
 #include <ufs/lfs/lfs_extern.h>
 
-void 
+void
 lfs_dump_super(lfsp)
 	struct lfs *lfsp;
 {
@@ -86,7 +86,7 @@ lfs_dump_super(lfsp)
 		"fbmask   ", lfsp->lfs_fbmask,
 		"fbshift  ", lfsp->lfs_fbshift);
 
-	(void)printf("%s%d\t%s%d\t%s%lx\t%s%qx\n", 
+	(void)printf("%s%d\t%s%d\t%s%lx\t%s%qx\n",
 		"sushift  ", lfsp->lfs_sushift,
 		"fsbtodb  ", lfsp->lfs_fsbtodb,
 		"cksum    ", lfsp->lfs_cksum,
diff --git a/sys/ufs/lfs/lfs_inode.c b/sys/ufs/lfs/lfs_inode.c
index cc298d9..61437c5 100644
--- a/sys/ufs/lfs/lfs_inode.c
+++ b/sys/ufs/lfs/lfs_inode.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs_inode.c	8.5 (Berkeley) 12/30/93
- * $Id: lfs_inode.c,v 1.7 1995/03/19 14:29:17 davidg Exp $
+ * $Id: lfs_inode.c,v 1.8 1995/03/26 23:29:13 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -128,7 +128,7 @@ lfs_update(ap)
 	if(ap->a_waitfor &  LFS_SYNC && vp->v_dirtyblkhd.lh_first != NULL)
 	       panic("lfs_update: dirty bufs");
 	return( error );
-	
+
 }
 
 /* Update segment usage information when removing a block. */
@@ -229,7 +229,7 @@ lfs_truncate(ap)
 #ifdef QUOTA
 		if (e1 = getinoquota(ip))
 			return (e1);
-#endif	
+#endif
 		if (e1 = bread(vp, lbn, fs->lfs_bsize, NOCRED, &bp))
 			return (e1);
 		ip->i_size = length;
@@ -289,9 +289,9 @@ lfs_truncate(ap)
 					brelse (bp);
 				else {
 					bzero((daddr_t *)bp->b_data +
-					    inp->in_off, fs->lfs_bsize - 
+					    inp->in_off, fs->lfs_bsize -
 					    inp->in_off * sizeof(daddr_t));
-					if (e1 = VOP_BWRITE(bp)) 
+					if (e1 = VOP_BWRITE(bp))
 						return (e1);
 				}
 			}
@@ -370,7 +370,7 @@ lfs_truncate(ap)
 #endif
 	fs->lfs_avail += fsbtodb(fs, a_released);
 	e1 = vinvalbuf(vp, (length > 0) ? V_SAVE : 0, ap->a_cred, ap->a_p,
-	    0, 0); 
+	    0, 0);
 	e2 = VOP_UPDATE(vp, &tv, &tv, 0);
 	return (e1 ? e1 : e2 ? e2 : 0);
 }
diff --git a/sys/ufs/lfs/lfs_segment.c b/sys/ufs/lfs/lfs_segment.c
index d639747..48a73ce 100644
--- a/sys/ufs/lfs/lfs_segment.c
+++ b/sys/ufs/lfs/lfs_segment.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs_segment.c	8.5 (Berkeley) 1/4/94
- * $Id: lfs_segment.c,v 1.9 1995/03/28 07:58:05 bde Exp $
+ * $Id: lfs_segment.c,v 1.10 1995/05/11 19:26:51 rgrimes Exp $
  */
 
 #include <sys/param.h>
@@ -98,7 +98,7 @@ lfs_reclaim_buffers() {
 		reclaimed = 1;
 		if( lfs_freebufs[i].address ){
                 	splx(s);
-                	free(lfs_freebufs[i].address, M_SEGMENT); 
+                	free(lfs_freebufs[i].address, M_SEGMENT);
                 	s = splhigh();
 		}
 		lfs_total_io_size -= lfs_freebufs[i].size;
@@ -133,8 +133,8 @@ lfs_alloc_buffer(int size) {
 	rtval = malloc(size, M_SEGMENT, M_WAITOK);
 	return rtval;
 }
-		
-	
+
+
 /*
  * Determine if it's OK to start a partial in this segment, or if we need
  * to go on to a new segment.
@@ -187,14 +187,14 @@ lfs_vflush(vp)
 	int error;
 
 	fs = VFSTOUFS(vp->v_mount)->um_lfs;
-	/* XXX 
-	 * lfs_segwrite uses lfs_writevnodes to flush dirty vnodes.  
-	 * lfs_writevnodes (by way of a check with lfs_vref) passes over 
+	/* XXX
+	 * lfs_segwrite uses lfs_writevnodes to flush dirty vnodes.
+	 * lfs_writevnodes (by way of a check with lfs_vref) passes over
 	 * locked vnodes.  Since we usually come here with vp locked, anytime
 	 * we just happen to call lfs_vflush and we are past the "MAX_ACTIVE"
 	 * threshold, we used to call lfs_seqwrite and assume it would take
-	 * care of the problem... but of course it didn't.  Now the question 
-	 * remains, is this the right thing to do, or should lfs_seqwrite or 
+	 * care of the problem... but of course it didn't.  Now the question
+	 * remains, is this the right thing to do, or should lfs_seqwrite or
 	 * lfs_writevnodes be fixed to handle locked vnodes??
 	 */
 	if (fs->lfs_nactive > MAX_ACTIVE){
@@ -283,7 +283,7 @@ loop:
 			(void) lfs_writeinode(fs, sp, ip);
 		}
 		vp->v_flag &= ~VDIROP;
-		lfs_vunref(vp); 
+		lfs_vunref(vp);
 	}
 }
 
@@ -338,7 +338,7 @@ lfs_segwrite(mp, flags)
 	if (fs->lfs_dirops && (error =
 	    tsleep(&fs->lfs_writer, PRIBIO + 1, "lfs writer", 0))) {
 		free(sp->bpp, M_SEGMENT);
-		free(sp, M_SEGMENT); 
+		free(sp, M_SEGMENT);
 		fs->lfs_writer = 0;
 		return (error);
 	}
@@ -360,7 +360,7 @@ lfs_segwrite(mp, flags)
 			segusep = (SEGUSE *)bp->b_data;
 			for (i = fs->lfs_sepb; i--; segusep++)
 				segusep->su_flags &= ~SEGUSE_ACTIVE;
-				
+
 			error = VOP_BWRITE(bp);
 		}
 
@@ -526,7 +526,7 @@ lfs_writeinode(fs, sp, ip)
 	 * No need to update segment usage if there was no former inode address
 	 * or if the last inode address is in the current partial segment.
 	 */
-	if (daddr != LFS_UNUSED_DADDR && 
+	if (daddr != LFS_UNUSED_DADDR &&
 	    !(daddr >= fs->lfs_lastpseg && daddr <= bp->b_blkno)) {
 		LFS_SEGENTRY(sup, fs, datosn(fs, daddr), bp);
 #ifdef DIAGNOSTIC
@@ -576,7 +576,7 @@ lfs_gatherblock(sp, bp, sptr)
 		sp->fip->fi_ino = VTOI(sp->vp)->i_number;
 		/* Add the current file to the segment summary. */
 		++((SEGSUM *)(sp->segsum))->ss_nfinfo;
-		sp->sum_bytes_left -= 
+		sp->sum_bytes_left -=
 		    sizeof(struct finfo) - sizeof(daddr_t);
 
 		if (sptr)
@@ -644,7 +644,7 @@ lfs_updatemeta(sp)
 
 	vp = sp->vp;
 	nblocks = &sp->fip->fi_blocks[sp->fip->fi_nblocks] - sp->start_lbp;
-	if (vp == NULL || nblocks == 0) 
+	if (vp == NULL || nblocks == 0)
 		return;
 
 	/* Sort the blocks. */
@@ -1171,7 +1171,7 @@ int
 lfs_vref(vp)
 	register struct vnode *vp;
 {
-    if ((vp->v_flag & VXLOCK) || 
+    if ((vp->v_flag & VXLOCK) ||
 	(vp->v_usecount == 0 &&
 	 vp->v_freelist.tqe_prev == (struct vnode **)0xdeadb))
       return(1);
diff --git a/sys/ufs/lfs/lfs_subr.c b/sys/ufs/lfs/lfs_subr.c
index 52d1574..f911c3f 100644
--- a/sys/ufs/lfs/lfs_subr.c
+++ b/sys/ufs/lfs/lfs_subr.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs_subr.c	8.2 (Berkeley) 9/21/93
- * $Id: lfs_subr.c,v 1.5 1995/01/04 23:46:32 gibbs Exp $
+ * $Id: lfs_subr.c,v 1.6 1995/01/09 16:05:23 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -101,7 +101,7 @@ lfs_seglock(fs, flags)
 		if (fs->lfs_lockpid == curproc->p_pid) {
 			++fs->lfs_seglock;
 			fs->lfs_sp->seg_flags |= flags;
-			return;			
+			return;
 		} else while (fs->lfs_seglock)
 			(void)tsleep(&fs->lfs_seglock, PRIBIO + 1,
 			    "lfs seglock", 0);
diff --git a/sys/ufs/lfs/lfs_syscalls.c b/sys/ufs/lfs/lfs_syscalls.c
index 13f71e2..1ec0cdc 100644
--- a/sys/ufs/lfs/lfs_syscalls.c
+++ b/sys/ufs/lfs/lfs_syscalls.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs_syscalls.c	8.5 (Berkeley) 4/20/94
- * $Id: lfs_syscalls.c,v 1.8 1995/04/24 05:13:28 dyson Exp $
+ * $Id: lfs_syscalls.c,v 1.9 1995/05/11 19:26:52 rgrimes Exp $
  */
 
 #include <sys/param.h>
@@ -171,7 +171,7 @@ lfs_markv(p, uap, retval)
 
 			/* Get the vnode/inode. */
 			if (lfs_fastvget(mntp, blkp->bi_inode, v_daddr, &vp,
-			    blkp->bi_lbn == LFS_UNUSED_LBN ? 
+			    blkp->bi_lbn == LFS_UNUSED_LBN ?
 			    blkp->bi_bp : NULL)) {
 #ifdef DIAGNOSTIC
 				printf("lfs_markv: VFS_VGET failed (%ld)\n",
@@ -244,7 +244,7 @@ err2:	lfs_vunref(vp);
 		} else
 			brelse(*bpp);
 	lfs_segunlock(fs);
-err1:	
+err1:
 	free(start, M_SEGMENT);
 	return (error);
 }
@@ -320,7 +320,7 @@ lfs_bmapv(p, uap, retval)
 struct lfs_segclean_args {
 	fsid_t *fsidp;		/* file system */
 	u_long segment;		/* segment number */
-}; 
+};
 int
 lfs_segclean(p, uap, retval)
 	struct proc *p;
diff --git a/sys/ufs/lfs/lfs_vnops.c b/sys/ufs/lfs/lfs_vnops.c
index eff079f..3d26953 100644
--- a/sys/ufs/lfs/lfs_vnops.c
+++ b/sys/ufs/lfs/lfs_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs_vnops.c	8.5 (Berkeley) 12/30/93
- * $Id: lfs_vnops.c,v 1.7 1995/03/28 07:58:06 bde Exp $
+ * $Id: lfs_vnops.c,v 1.8 1995/04/09 06:03:42 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -496,7 +496,7 @@ lfs_inactive(ap)
 		struct vnode *a_vp;
 	} */ *ap;
 {
-	
+
         if (ap->a_vp->v_flag & VNINACT) {
 	  return(0);
         }
diff --git a/sys/ufs/ufs/inode.h b/sys/ufs/ufs/inode.h
index f0c7297..00105ea 100644
--- a/sys/ufs/ufs/inode.h
+++ b/sys/ufs/ufs/inode.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)inode.h	8.4 (Berkeley) 1/21/94
- * $Id: inode.h,v 1.4 1994/12/27 13:59:14 bde Exp $
+ * $Id: inode.h,v 1.5 1995/04/24 05:13:11 dyson Exp $
  */
 
 #ifndef _UFS_UFS_INODE_H_
@@ -57,7 +57,7 @@
  * file in the UFS filesystem. It is composed of two types of
  * information. The first part is the information that is needed
  * only while the file is active (such as the identity of the file
- * and linkage to speed its lookup). The second part is the 
+ * and linkage to speed its lookup). The second part is the
  * permannent meta-data associated with the file which is read
  * in from the permanent dinode from long term storage when the
  * file becomes active, and is put back when the file is no longer
diff --git a/sys/ufs/ufs/ufs_bmap.c b/sys/ufs/ufs/ufs_bmap.c
index 1bc8455..900d2c2 100644
--- a/sys/ufs/ufs/ufs_bmap.c
+++ b/sys/ufs/ufs/ufs_bmap.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_bmap.c	8.6 (Berkeley) 1/21/94
- * $Id: ufs_bmap.c,v 1.6 1995/03/04 03:24:45 davidg Exp $
+ * $Id: ufs_bmap.c,v 1.7 1995/03/28 07:58:16 bde Exp $
  */
 
 #include <sys/param.h>
@@ -159,7 +159,7 @@ ufs_bmaparray(vp, bn, bnp, ap, nump, runp)
 
 	devvp = VFSTOUFS(vp->v_mount)->um_devvp;
 	for (bp = NULL, ++xap; --num; ++xap) {
-		/* 
+		/*
 		 * Exit the loop if there is no disk address assigned yet and
 		 * the indirect block isn't in the cache, or if we were
 		 * looking for an indirect block and we've found it.
@@ -242,7 +242,7 @@ ufs_getlbns(vp, bn, ap, nump)
 	if (bn < NDADDR)
 		return (0);
 
-	/* 
+	/*
 	 * Determine the number of levels of indirection.  After this loop
 	 * is done, blockcnt indicates the number of data blocks possible
 	 * at the given level of indirection, and NIADDR - i is the number
@@ -262,7 +262,7 @@ ufs_getlbns(vp, bn, ap, nump)
 	else
 		metalbn = -(-realbn - bn + NIADDR - i);
 
-	/* 
+	/*
 	 * At each iteration, off is the offset into the bap array which is
 	 * an array of disk addresses at the current level of indirection.
 	 * The logical block number and the offset in that block are stored
diff --git a/sys/ufs/ufs/ufs_disksubr.c b/sys/ufs/ufs/ufs_disksubr.c
index 8d4a6fd..958f594 100644
--- a/sys/ufs/ufs/ufs_disksubr.c
+++ b/sys/ufs/ufs/ufs_disksubr.c
@@ -42,7 +42,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_disksubr.c	8.5 (Berkeley) 1/21/94
- * $Id: ufs_disksubr.c,v 1.13 1995/03/18 06:38:04 davidg Exp $
+ * $Id: ufs_disksubr.c,v 1.14 1995/03/18 07:06:51 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -255,7 +255,7 @@ readdisklabel(dev, strat, lp, dp, bdp)
 	 * will be relative to the base of the BSD part.
 	 */
 	msgMSP = readMSPtolabel(dev, strat, lp, dp, &cyl );
-	
+
 	/*
 	 * next, dig out disk label, relative to either the base of the
 	 * BSD part, or block 0, depending on if an MSP was found.
@@ -481,7 +481,7 @@ writedisklabel(dev, strat, lp)
 	 * force OURPART to start at block 0 as a default in case there is NO
 	 * MSP.
 	 * readMSPtolabel() will reset it to start at the start of the BSD
-	 * part if it exists 
+	 * part if it exists
 	 * At this time this is an error contition but I've left support for it
 	 */
 	lp->d_npartitions = OURPART + 1;
@@ -491,7 +491,7 @@ writedisklabel(dev, strat, lp)
 
 	msg = readMSPtolabel(dev, strat, lp, 0, &cyl );
 	/*
-	 * If we want to be able to install without an Machine Specific 
+	 * If we want to be able to install without an Machine Specific
 	 * Partitioning , then
 	 * the failure of readMSPtolabel() should be made non fatal.
 	 */
@@ -515,7 +515,7 @@ writedisklabel(dev, strat, lp)
 	/*
 	 * get all the other bits back from the good new disklabel
 	 * (the user wouldn't try confuse us would he?)
-	 * With the exception of the OURPART which now points to the 
+	 * With the exception of the OURPART which now points to the
 	 * BSD partition.
 	 */
 	BSDstart = lp->d_partitions[OURPART].p_offset;
diff --git a/sys/ufs/ufs/ufs_quota.c b/sys/ufs/ufs/ufs_quota.c
index e1ba55cd..9b1f621 100644
--- a/sys/ufs/ufs/ufs_quota.c
+++ b/sys/ufs/ufs/ufs_quota.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_quota.c	8.2 (Berkeley) 12/30/93
- * $Id: ufs_quota.c,v 1.3 1994/10/06 21:07:02 davidg Exp $
+ * $Id: ufs_quota.c,v 1.4 1994/10/08 06:57:27 phk Exp $
  */
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -450,7 +450,7 @@ quotaoff(p, mp, type)
 	register struct dquot *dq;
 	register struct inode *ip;
 	int error;
-	
+
 	if ((mp->mnt_flag & MNT_MPBUSY) == 0)
 		panic("quotaoff: not busy");
 	if ((qvp = ump->um_quotas[type]) == NULLVP)
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
index b5fef5d..48e52dd 100644
--- a/sys/ufs/ufs/ufs_vnops.c
+++ b/sys/ufs/ufs/ufs_vnops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_vnops.c	8.10 (Berkeley) 4/1/94
- * $Id: ufs_vnops.c,v 1.22 1995/04/25 03:32:37 dyson Exp $
+ * $Id: ufs_vnops.c,v 1.23 1995/05/15 07:31:09 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -393,7 +393,7 @@ ufs_setattr(ap)
 	if (vap->va_atime.ts_sec != VNOVAL || vap->va_mtime.ts_sec != VNOVAL) {
 		if (cred->cr_uid != ip->i_uid &&
 		    (error = suser(cred, &p->p_acflag)) &&
-		    ((vap->va_vaflags & VA_UTIMES_NULL) == 0 || 
+		    ((vap->va_vaflags & VA_UTIMES_NULL) == 0 ||
 		    (error = VOP_ACCESS(vp, VWRITE, cred, p))))
 			return (error);
 		if (vap->va_atime.ts_sec != VNOVAL)
@@ -878,7 +878,7 @@ abortit:
 	 * directory heirarchy above the target, as this would
 	 * orphan everything below the source directory. Also
 	 * the user must have write permission in the source so
-	 * as to be able to change "..". We must repeat the call 
+	 * as to be able to change "..". We must repeat the call
 	 * to namei, as the parent directory is unlocked by the
 	 * call to checkpath().
 	 */
@@ -906,7 +906,7 @@ abortit:
 	}
 	/*
 	 * 2) If target doesn't exist, link the target
-	 *    to the source and unlink the source. 
+	 *    to the source and unlink the source.
 	 *    Otherwise, rewrite the target directory
 	 *    entry to reference the source inode and
 	 *    expunge the original entry's existence.
@@ -966,7 +966,7 @@ abortit:
 		 * (both directories, or both not directories).
 		 */
 		if ((xp->i_mode&IFMT) == IFDIR) {
-			if (!ufs_dirempty(xp, dp->i_number, tcnp->cn_cred) || 
+			if (!ufs_dirempty(xp, dp->i_number, tcnp->cn_cred) ||
 			    xp->i_nlink > 2) {
 				error = ENOTEMPTY;
 				goto bad;
@@ -1061,7 +1061,7 @@ abortit:
 			dp->i_flag |= IN_CHANGE;
 			error = vn_rdwr(UIO_READ, fvp, (caddr_t)&dirbuf,
 				sizeof (struct dirtemplate), (off_t)0,
-				UIO_SYSSPACE, IO_NODELOCKED, 
+				UIO_SYSSPACE, IO_NODELOCKED,
 				tcnp->cn_cred, (int *)0, (struct proc *)0);
 			if (error == 0) {
 #				if (BYTE_ORDER == LITTLE_ENDIAN)
@@ -1366,7 +1366,7 @@ ufs_symlink(ap)
 
 /*
  * Vnode op for reading directories.
- * 
+ *
  * The routine below assumes that the on-disk format of a directory
  * is the same as that defined by <sys/dirent.h>. If the on-disk
  * format changes, then it will be necessary to do a conversion
@@ -1916,7 +1916,7 @@ ufs_vinit(mntp, specops, fifoops, vpp)
 		break;
 	default:
 		break;
-	
+
 	}
 	if (ip->i_number == ROOTINO)
                 vp->v_flag |= VROOT;
@@ -1953,7 +1953,7 @@ ufs_makeinode(mode, dvp, vpp, cnp)
 	if ((mode & IFMT) == 0)
 		mode |= IFREG;
 
-	error = VOP_VALLOC(dvp, mode, cnp->cn_cred, &tvp); 
+	error = VOP_VALLOC(dvp, mode, cnp->cn_cred, &tvp);
 	if (error) {
 		free(cnp->cn_pnbuf, M_NAMEI);
 		vput(dvp);