d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed some English errors in previous commit.

Browse Source 
Fixed some style bugs in the removal of __P(()).  Whitespace before
"__P((" was not removed.
This commit is contained in:
Bruce Evans 2002-04-04 09:45:11 +00:00
parent 2654e1fc4e
commit a2f4e30c8c
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=93775
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
sbin/newfs/mkfs.c
View File

@ -97,17 +97,17 @@ static int randinit;
static daddr_t alloc(int size, int mode); static daddr_t alloc(int size, int mode);
static long calcipg(long lcpg, long bpcg, off_t *usedbp); static long calcipg(long lcpg, long bpcg, off_t *usedbp);
static int charsperline(void); static int charsperline(void);
static void clrblock (struct fs *, unsigned char *, int); static void clrblock(struct fs *, unsigned char *, int);
static void fsinit (time_t); static void fsinit(time_t);
static int ilog2(int); static int ilog2(int);
static void initcg (int, time_t); static void initcg(int, time_t);
static int isblock (struct fs *, unsigned char *, int); static int isblock(struct fs *, unsigned char *, int);
static void iput (struct dinode *, ino_t); static void iput(struct dinode *, ino_t);
static int makedir (struct direct *, int); static int makedir(struct direct *, int);
static void rdfs (daddr_t, int, char *); static void rdfs(daddr_t, int, char *);
static void setblock (struct fs *, unsigned char *, int); static void setblock(struct fs *, unsigned char *, int);
static void wtfs (daddr_t, int, char *); static void wtfs(daddr_t, int, char *);
static void wtfsflush (void); static void wtfsflush(void);
void void
mkfs(struct partition *pp, char *fsys, int fi, int fo) mkfs(struct partition *pp, char *fsys, int fi, int fo)
@ -178,7 +178,7 @@ mkfs(struct partition *pp, char *fsys, int fi, int fo)
exit(17); exit(17);
} }
if (sblock.fs_fsize < sectorsize) { if (sblock.fs_fsize < sectorsize) {
printf("increasing fragment size from %d to sectorsize (%d)\n", printf("increasing fragment size from %d to sector size (%d)\n",
sblock.fs_fsize, sectorsize); sblock.fs_fsize, sectorsize);
sblock.fs_fsize = sectorsize; sblock.fs_fsize = sectorsize;
} }
@ -188,12 +188,13 @@ mkfs(struct partition *pp, char *fsys, int fi, int fo)
sblock.fs_bsize = MINBSIZE; sblock.fs_bsize = MINBSIZE;
} }
if (sblock.fs_bsize < sblock.fs_fsize) { if (sblock.fs_bsize < sblock.fs_fsize) {
printf("increasing block size from %d to fragsize (%d)\n", printf("increasing block size from %d to fragment size (%d)\n",
sblock.fs_bsize, sblock.fs_fsize); sblock.fs_bsize, sblock.fs_fsize);
sblock.fs_bsize = sblock.fs_fsize; sblock.fs_bsize = sblock.fs_fsize;
} }
if (sblock.fs_fsize * MAXFRAG < sblock.fs_bsize) { if (sblock.fs_fsize * MAXFRAG < sblock.fs_bsize) {
printf("increasing fragsize from %d to block size / %d (%d)\n", printf(
"increasing fragment size from %d to block size / %d (%d)\n",
sblock.fs_fsize, MAXFRAG, sblock.fs_bsize / MAXFRAG); sblock.fs_fsize, MAXFRAG, sblock.fs_bsize / MAXFRAG);
sblock.fs_fsize = sblock.fs_bsize / MAXFRAG; sblock.fs_fsize = sblock.fs_bsize / MAXFRAG;
} }
@ -206,7 +207,7 @@ mkfs(struct partition *pp, char *fsys, int fi, int fo)
sblock.fs_frag = numfrags(&sblock, sblock.fs_bsize); sblock.fs_frag = numfrags(&sblock, sblock.fs_bsize);
sblock.fs_fragshift = ilog2(sblock.fs_frag); sblock.fs_fragshift = ilog2(sblock.fs_frag);
if (sblock.fs_frag > MAXFRAG) { if (sblock.fs_frag > MAXFRAG) {
printf( "SYSERR: fragsize too small %d (block/frag ratio)\n", printf("fragment size %d is still too small (can't happen)\n",
sblock.fs_bsize / MAXFRAG); sblock.fs_bsize / MAXFRAG);
exit(21); exit(21);
} }