diff options
| author | phk <phk@FreeBSD.org> | 2002-05-12 23:44:15 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2002-05-12 23:44:15 +0000 |
| commit | d4023f2e24f76a780fa8dc8a8102a24bc61db723 (patch) | |
| tree | ddf4e8af9db2f764e32a42f67fac111c0999753b /sbin/fsck_ffs/pass5.c | |
| parent | e76663bf875c4d4b218d6483379d4a4133ca13ee (diff) | |
| download | FreeBSD-src-d4023f2e24f76a780fa8dc8a8102a24bc61db723.zip FreeBSD-src-d4023f2e24f76a780fa8dc8a8102a24bc61db723.tar.gz | |
UFS2 preparation commit:
Remove support for converting old FFS formats to newer.
Submitted by: mckusick
Sponspored by: DARPA & NAI Labs.
Diffstat (limited to 'sbin/fsck_ffs/pass5.c')
| -rw-r--r-- | sbin/fsck_ffs/pass5.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/sbin/fsck_ffs/pass5.c b/sbin/fsck_ffs/pass5.c index 1d73dc8..f2ab2a8 100644 --- a/sbin/fsck_ffs/pass5.c +++ b/sbin/fsck_ffs/pass5.c @@ -60,7 +60,7 @@ pass5(void) struct fs *fs = &sblock; struct cg *cg = &cgrp; ufs_daddr_t dbase, dmax, d; - int i, j, excessdirs; + int i, j, excessdirs, rewritecg = 0; struct csum *cs; struct csum cstotal; struct inodesc idesc[3]; @@ -77,7 +77,7 @@ pass5(void) pwarn("DELETING CLUSTERING MAPS\n"); if (preen || reply("DELETE CLUSTERING MAPS")) { fs->fs_contigsumsize = 0; - doinglevel1 = 1; + rewritecg = 1; sbdirty(); } } @@ -104,7 +104,7 @@ pass5(void) doit); fs->fs_cgsize = fragroundup(fs, CGSIZE(fs)); - doinglevel1 = 1; + rewritecg = 1; sbdirty(); } } @@ -161,11 +161,8 @@ pass5(void) fs->fs_postblformat); } memset(&idesc[0], 0, sizeof idesc); - for (i = 0; i < 3; i++) { + for (i = 0; i < 3; i++) idesc[i].id_type = ADDR; - if (doinglevel2) - idesc[i].id_fix = FIX; - } memset(&cstotal, 0, sizeof(struct csum)); j = blknum(fs, fs->fs_size + fs->fs_frag - 1); for (i = fs->fs_size; i < j; i++) @@ -309,7 +306,7 @@ pass5(void) memmove(cs, &newcg->cg_cs, sizeof *cs); sbdirty(); } - if (doinglevel1) { + if (rewritecg) { memmove(cg, newcg, (size_t)fs->fs_cgsize); cgdirty(); continue; |
