Author: trasz
Date: Sat Jun 23 19:08:24 2012
New Revision: 237500
URL: http://svn.freebsd.org/changeset/base/237500
Log:
MFC r234189:
Style.
MFC r234312:
Remove FSIRAND and FSMAXSWAP ifdefs, removing code unconditionally.
Reviewed by: kib, mckusick
Sponsored by: The FreeBSD Foundation
MFC r234314:
Style.
MFC r234420:
Style.
Modified:
stable/9/sbin/growfs/debug.c
stable/9/sbin/growfs/growfs.c
Directory Properties:
stable/9/sbin/growfs/ (props changed)
Modified: stable/9/sbin/growfs/debug.c
==============================================================================
--- stable/9/sbin/growfs/debug.c Sat Jun 23 19:03:42 2012
(r237499)
+++ stable/9/sbin/growfs/debug.c Sat Jun 23 19:08:24 2012
(r237500)
@@ -127,9 +127,7 @@ dbg_dump_hex(struct fs *sb, const char *
void
dbg_dump_fs(struct fs *sb, const char *comment)
{
-#ifdef FSMAXSNAP
int j;
-#endif /* FSMAXSNAP */
if (!dbg_log)
return;
@@ -299,7 +297,6 @@ dbg_dump_fs(struct fs *sb, const char *c
fprintf(dbg_log, "pendinginodes int32_t 0x%08x\n",
sb->fs_pendinginodes);
-#ifdef FSMAXSNAP
for (j = 0; j < FSMAXSNAP; j++) {
fprintf(dbg_log, "snapinum int32_t[%2d] 0x%08x\n",
j, sb->fs_snapinum[j]);
@@ -307,7 +304,6 @@ dbg_dump_fs(struct fs *sb, const char *c
break;
}
}
-#endif /* FSMAXSNAP */
fprintf(dbg_log, "avgfilesize int32_t 0x%08x\n",
sb->fs_avgfilesize);
fprintf(dbg_log, "avgfpdir int32_t 0x%08x\n",
Modified: stable/9/sbin/growfs/growfs.c
==============================================================================
--- stable/9/sbin/growfs/growfs.c Sat Jun 23 19:03:42 2012
(r237499)
+++ stable/9/sbin/growfs/growfs.c Sat Jun 23 19:08:24 2012
(r237500)
@@ -76,7 +76,7 @@ int _dbg_lvl_ = (DL_INFO); /* DL_TRC */
static union {
struct fs fs;
- char pad[SBLOCKSIZE];
+ char pad[SBLOCKSIZE];
} fsun1, fsun2;
#define sblock fsun1.fs /* the new superblock */
#define osblock fsun2.fs /* the old superblock */
@@ -89,7 +89,7 @@ static ufs2_daddr_t sblockloc;
static union {
struct cg cg;
- char pad[MAXBSIZE];
+ char pad[MAXBSIZE];
} cgun1, cgun2;
#define acg cgun1.cg /* a cylinder cgroup (new) */
#define aocg cgun2.cg /* an old cylinder group */
@@ -130,8 +130,7 @@ growfs(int fsi, int fso, unsigned int Nf
uint cylno;
int i, j, width;
char tmpbuf[100];
-#ifdef FSIRAND
- static int randinit=0;
+ static int randinit = 0;
DBG_ENTER;
@@ -139,11 +138,6 @@ growfs(int fsi, int fso, unsigned int Nf
randinit = 1;
srandomdev();
}
-#else /* not FSIRAND */
-
- DBG_ENTER;
-
-#endif /* FSIRAND */
time(&modtime);
/*
@@ -183,7 +177,7 @@ growfs(int fsi, int fso, unsigned int Nf
/*
* Dump out summary information about file system.
*/
-# define B2MBFACTOR (1 / (1024.0 * 1024.0))
+#define B2MBFACTOR (1 / (1024.0 * 1024.0))
printf("growfs: %.1fMB (%jd sectors) block size %d, fragment size %d\n",
(float)sblock.fs_size * sblock.fs_fsize * B2MBFACTOR,
(intmax_t)fsbtodb(&sblock, sblock.fs_size), sblock.fs_bsize,
@@ -193,7 +187,7 @@ growfs(int fsi, int fso, unsigned int Nf
sblock.fs_fpg / sblock.fs_frag, sblock.fs_ipg);
if (sblock.fs_flags & FS_DOSOFTDEP)
printf("\twith soft updates\n");
-# undef B2MBFACTOR
+#undef B2MBFACTOR
/*
* Now build the cylinders group blocks and
@@ -319,11 +313,9 @@ initcg(int cylno, time_t modtime, int fs
static caddr_t iobuf;
long blkno, start;
ufs2_daddr_t i, cbase, dmax;
-#ifdef FSIRAND
struct ufs1_dinode *dp1;
-#endif
struct csum *cs;
- uint d, dupper, dlower;
+ uint j, d, dupper, dlower;
if (iobuf == NULL && (iobuf = malloc(sblock.fs_bsize * 3)) == NULL)
errx(37, "panic: cannot allocate I/O buffer");
@@ -399,13 +391,11 @@ initcg(int cylno, time_t modtime, int fs
bzero(iobuf, sblock.fs_bsize);
for (i = 0; i < sblock.fs_ipg / INOPF(&sblock);
i += sblock.fs_frag) {
-#ifdef FSIRAND
dp1 = (struct ufs1_dinode *)(void *)iobuf;
for (j = 0; j < INOPB(&sblock); j++) {
dp1->di_gen = random();
dp1++;
}
-#endif
wtfs(fsbtodb(&sblock, cgimin(&sblock, cylno) + i),
sblock.fs_bsize, iobuf, fso, Nflag);
}
@@ -509,7 +499,7 @@ frag_adjust(ufs2_daddr_t frag, int sign)
DBG_ENTER;
- fragsize=0;
+ fragsize = 0;
/*
* Here frag only needs to point to any fragment in the block we want
* to examine.
@@ -526,7 +516,7 @@ frag_adjust(ufs2_daddr_t frag, int sign)
/*
* We found something in between.
*/
- acg.cg_frsum[fragsize]+=sign;
+ acg.cg_frsum[fragsize] += sign;
DBG_PRINT2("frag_adjust [%d]+=%d\n",
fragsize, sign);
}
@@ -589,7 +579,7 @@ updjcg(int cylno, time_t modtime, int fs
if (cgbase(&osblock, cylno + 1) == osblock.fs_size) {
if (sblock.fs_magic == FS_UFS1_MAGIC)
- acg.cg_old_ncyl=sblock.fs_old_cpg;
+ acg.cg_old_ncyl = sblock.fs_old_cpg;
wtfs(fsbtodb(&sblock, cgtod(&sblock, cylno)),
(size_t)sblock.fs_cgsize, (void *)&acg, fso, Nflag);
@@ -882,8 +872,7 @@ updcsloc(time_t modtime, int fsi, int fs
*/
if (sblock.fs_contigsumsize > 0) {
for (block = howmany(d % sblock.fs_fpg, sblock.fs_frag),
- lcs = 0; lcs < sblock.fs_contigsumsize;
- block++, lcs++) {
+ lcs = 0; lcs < sblock.fs_contigsumsize; block++, lcs++) {
if (isclr(cg_clustersfree(&acg), block))
break;
}
@@ -913,7 +902,7 @@ updcsloc(time_t modtime, int fsi, int fs
* (incomplete) block of the cylinder summary.
*/
d++;
- frag_adjust(d%sblock.fs_fpg, 1);
+ frag_adjust(d % sblock.fs_fpg, 1);
if (isblock(&sblock, cg_blksfree(&acg),
(d % sblock.fs_fpg) / sblock.fs_frag)) {
@@ -924,8 +913,7 @@ updcsloc(time_t modtime, int fsi, int fs
sblock.fs_cstotal.cs_nbfree++;
if (sblock.fs_contigsumsize > 0) {
setbit(cg_clustersfree(&acg),
- (d % sblock.fs_fpg) /
- sblock.fs_frag);
+ (d % sblock.fs_fpg) / sblock.fs_frag);
if (lcs < sblock.fs_contigsumsize) {
if (lcs)
cg_clustersum(&acg)[lcs]--;
@@ -1026,8 +1014,7 @@ updcsloc(time_t modtime, int fsi, int fs
* Allocate all fragments used by the cylinder summary in the
* last block.
*/
- if (d <
- sblock.fs_csaddr + (sblock.fs_cssize / sblock.fs_fsize)) {
+ if (d < sblock.fs_csaddr + (sblock.fs_cssize / sblock.fs_fsize)) {
for (; d - sblock.fs_csaddr <
sblock.fs_cssize/sblock.fs_fsize; d++) {
clrbit(cg_blksfree(&acg), d % sblock.fs_fpg);
@@ -1248,7 +1235,7 @@ charsperline(void)
columns = 80; /* last resort */
DBG_LEAVE;
- return columns;
+ return (columns);
}
/*
@@ -1306,9 +1293,7 @@ main(int argc, char **argv)
int i, fsi, fso;
u_int32_t p_size;
char reply[5];
-#ifdef FSMAXSNAP
int j;
-#endif /* FSMAXSNAP */
DBG_ENTER;
@@ -1445,8 +1430,6 @@ main(int argc, char **argv)
(intmax_t)osblock.fs_size, (intmax_t)sblock.fs_size);
}
-
-#ifdef FSMAXSNAP
/*
* Check if we find an active snapshot.
*/
@@ -1461,7 +1444,6 @@ main(int argc, char **argv)
break;
}
}
-#endif
if (ExpertFlag == 0 && Nflag == 0) {
printf("We strongly recommend you to make a backup "
@@ -1544,7 +1526,7 @@ main(int argc, char **argv)
DBG_CLOSE;
DBG_LEAVE;
- return 0;
+ return (0);
}
/*
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
