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

Style.

Browse Source
This commit is contained in:
Edward Tomasz Napierala 2012-04-12 16:55:48 +00:00
parent 4b47ece986
commit 6ad07d53c2
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sbin/growfs/growfs.c
View File

@ -76,7 +76,7 @@ int _dbg_lvl_ = (DL_INFO); /* DL_TRC */
static union { static union {
struct fs fs; struct fs fs;
char pad[SBLOCKSIZE]; char pad[SBLOCKSIZE];
} fsun1, fsun2; } fsun1, fsun2;
#define sblock fsun1.fs /* the new superblock */ #define sblock fsun1.fs /* the new superblock */
#define osblock fsun2.fs /* the old superblock */ #define osblock fsun2.fs /* the old superblock */
@ -89,7 +89,7 @@ static ufs2_daddr_t sblockloc;
static union { static union {
struct cg cg; struct cg cg;
char pad[MAXBSIZE]; char pad[MAXBSIZE];
} cgun1, cgun2; } cgun1, cgun2;
#define acg cgun1.cg /* a cylinder cgroup (new) */ #define acg cgun1.cg /* a cylinder cgroup (new) */
#define aocg cgun2.cg /* an old cylinder group */ #define aocg cgun2.cg /* an old cylinder group */
@ -526,7 +526,7 @@ frag_adjust(ufs2_daddr_t frag, int sign)
/* /*
* We found something in between. * We found something in between.
*/ */
acg.cg_frsum[fragsize]+=sign; acg.cg_frsum[fragsize] += sign;
DBG_PRINT2("frag_adjust [%d]+=%d\n", DBG_PRINT2("frag_adjust [%d]+=%d\n",
fragsize, sign); fragsize, sign);
} }
@ -882,8 +882,7 @@ updcsloc(time_t modtime, int fsi, int fso, unsigned int Nflag)
*/ */
if (sblock.fs_contigsumsize > 0) { if (sblock.fs_contigsumsize > 0) {
for (block = howmany(d % sblock.fs_fpg, sblock.fs_frag), for (block = howmany(d % sblock.fs_fpg, sblock.fs_frag),
lcs = 0; lcs < sblock.fs_contigsumsize; lcs = 0; lcs < sblock.fs_contigsumsize; block++, lcs++) {
block++, lcs++) {
if (isclr(cg_clustersfree(&acg), block)) if (isclr(cg_clustersfree(&acg), block))
break; break;
} }
@ -913,7 +912,7 @@ updcsloc(time_t modtime, int fsi, int fso, unsigned int Nflag)
* (incomplete) block of the cylinder summary. * (incomplete) block of the cylinder summary.
*/ */
d++; d++;
frag_adjust(d%sblock.fs_fpg, 1); frag_adjust(d % sblock.fs_fpg, 1);
if (isblock(&sblock, cg_blksfree(&acg), if (isblock(&sblock, cg_blksfree(&acg),
(d % sblock.fs_fpg) / sblock.fs_frag)) { (d % sblock.fs_fpg) / sblock.fs_frag)) {
@ -924,8 +923,7 @@ updcsloc(time_t modtime, int fsi, int fso, unsigned int Nflag)
sblock.fs_cstotal.cs_nbfree++; sblock.fs_cstotal.cs_nbfree++;
if (sblock.fs_contigsumsize > 0) { if (sblock.fs_contigsumsize > 0) {
setbit(cg_clustersfree(&acg), setbit(cg_clustersfree(&acg),
(d % sblock.fs_fpg) / (d % sblock.fs_fpg) / sblock.fs_frag);
sblock.fs_frag);
if (lcs < sblock.fs_contigsumsize) { if (lcs < sblock.fs_contigsumsize) {
if (lcs) if (lcs)
cg_clustersum(&acg)[lcs]--; cg_clustersum(&acg)[lcs]--;
@ -1026,8 +1024,7 @@ updcsloc(time_t modtime, int fsi, int fso, unsigned int Nflag)
* Allocate all fragments used by the cylinder summary in the * Allocate all fragments used by the cylinder summary in the
* last block. * last block.
*/ */
if (d < if (d < sblock.fs_csaddr + (sblock.fs_cssize / sblock.fs_fsize)) {
sblock.fs_csaddr + (sblock.fs_cssize / sblock.fs_fsize)) {
for (; d - sblock.fs_csaddr < for (; d - sblock.fs_csaddr <
sblock.fs_cssize/sblock.fs_fsize; d++) { sblock.fs_cssize/sblock.fs_fsize; d++) {
clrbit(cg_blksfree(&acg), d % sblock.fs_fpg); clrbit(cg_blksfree(&acg), d % sblock.fs_fpg);