diff options
| author | sbruno <sbruno@FreeBSD.org> | 2013-03-23 04:26:13 +0000 |
|---|---|---|
| committer | sbruno <sbruno@FreeBSD.org> | 2013-03-23 04:26:13 +0000 |
| commit | ee156374eead97ea0d36a374d0a9ccb6d2ed7e40 (patch) | |
| tree | 0919d525762dd205d22121917dfe139e9308d76c /sbin/fsck_ffs/pass5.c | |
| parent | 1bcec8f048d439f4090ca60786176dd52dbe87b1 (diff) | |
| download | FreeBSD-src-ee156374eead97ea0d36a374d0a9ccb6d2ed7e40.zip FreeBSD-src-ee156374eead97ea0d36a374d0a9ccb6d2ed7e40.tar.gz | |
Revert svn r248625
Clang errors around printf could be trivially fixed, but the breakage in
sbin/fsdb were to significant for this type of change.
Submitter of this changeset has been notified and hopefully this can be
restored soon.
Diffstat (limited to 'sbin/fsck_ffs/pass5.c')
| -rw-r--r-- | sbin/fsck_ffs/pass5.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sbin/fsck_ffs/pass5.c b/sbin/fsck_ffs/pass5.c index 146acec..b95df73 100644 --- a/sbin/fsck_ffs/pass5.c +++ b/sbin/fsck_ffs/pass5.c @@ -59,14 +59,14 @@ pass5(void) int c, i, j, blk, frags, basesize, mapsize; int inomapsize, blkmapsize; struct fs *fs = &sblock; + struct cg *cg = &cgrp; ufs2_daddr_t d, dbase, dmax, start; int rewritecg = 0; struct csum *cs; struct csum_total cstotal; struct inodesc idesc[3]; char buf[MAXBSIZE]; - struct cg *cg, *newcg = (struct cg *)buf; - struct bufarea *cgbp; + struct cg *newcg = (struct cg *)buf; inoinfo(WINO)->ino_state = USTATE; memset(newcg, 0, (size_t)fs->fs_cgsize); @@ -162,8 +162,7 @@ pass5(void) c * 100 / sblock.fs_ncg); got_sigalarm = 0; } - cgbp = cgget(c); - cg = cgbp->b_un.b_cg; + getblk(&cgblk, cgtod(fs, c), fs->fs_cgsize); if (!cg_chkmagic(cg)) pfatal("CG %d: BAD MAGIC NUMBER\n", c); newcg->cg_time = cg->cg_time; @@ -325,14 +324,14 @@ pass5(void) } if (rewritecg) { memmove(cg, newcg, (size_t)fs->fs_cgsize); - dirty(cgbp); + cgdirty(); continue; } if (cursnapshot == 0 && memcmp(newcg, cg, basesize) != 0 && dofix(&idesc[2], "SUMMARY INFORMATION BAD")) { memmove(cg, newcg, (size_t)basesize); - dirty(cgbp); + cgdirty(); } if (bkgrdflag != 0 || usedsoftdep || debug) update_maps(cg, newcg, bkgrdflag); @@ -341,7 +340,7 @@ pass5(void) dofix(&idesc[1], "BLK(S) MISSING IN BIT MAPS")) { memmove(cg_inosused(cg), cg_inosused(newcg), (size_t)mapsize); - dirty(cgbp); + cgdirty(); } } if (cursnapshot == 0 && |
