diff options
author | rgrimes <rgrimes@FreeBSD.org> | 1995-05-30 08:16:23 +0000 |
---|---|---|
committer | rgrimes <rgrimes@FreeBSD.org> | 1995-05-30 08:16:23 +0000 |
commit | c86f0c7a71e7ade3e38b325c186a9cf374e0411e (patch) | |
tree | 176f04f674860c7cfae9ac5d2ff4d4e1d73cb2b7 /sys/ufs/ffs | |
parent | 423ba8f9bc23d93bfc244aca9b12563b1c9de90d (diff) | |
download | FreeBSD-src-c86f0c7a71e7ade3e38b325c186a9cf374e0411e.zip FreeBSD-src-c86f0c7a71e7ade3e38b325c186a9cf374e0411e.tar.gz |
Remove trailing whitespace.
Diffstat (limited to 'sys/ufs/ffs')
-rw-r--r-- | sys/ufs/ffs/ffs_alloc.c | 38 | ||||
-rw-r--r-- | sys/ufs/ffs/ffs_balloc.c | 4 | ||||
-rw-r--r-- | sys/ufs/ffs/ffs_subr.c | 4 | ||||
-rw-r--r-- | sys/ufs/ffs/ffs_tables.c | 4 | ||||
-rw-r--r-- | sys/ufs/ffs/ffs_vfsops.c | 8 | ||||
-rw-r--r-- | sys/ufs/ffs/ffs_vnops.c | 4 | ||||
-rw-r--r-- | sys/ufs/ffs/fs.h | 10 |
7 files changed, 36 insertions, 36 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) \ |