diff options
| -rw-r--r-- | sbin/fsck/main.c | 4 | ||||
| -rw-r--r-- | sbin/fsck/setup.c | 10 | ||||
| -rw-r--r-- | sbin/fsck_ffs/main.c | 4 | ||||
| -rw-r--r-- | sbin/fsck_ffs/setup.c | 10 | ||||
| -rw-r--r-- | sbin/fsck_ifs/main.c | 4 | ||||
| -rw-r--r-- | sbin/fsck_ifs/setup.c | 10 |
6 files changed, 18 insertions, 24 deletions
diff --git a/sbin/fsck/main.c b/sbin/fsck/main.c index b7343da..fbeb3ee 100644 --- a/sbin/fsck/main.c +++ b/sbin/fsck/main.c @@ -197,10 +197,6 @@ checkfilesys(filesys, mntpt, auxdata, child) pfatal("CAN'T CHECK FILE SYSTEM."); /* fall through */ case -1: - return (0); - } - - if (preen && sblock.fs_clean && !fflag) { pwarn("clean, %ld free ", sblock.fs_cstotal.cs_nffree + sblock.fs_frag * sblock.fs_cstotal.cs_nbfree); printf("(%ld frags, %ld blocks, %.1f%% fragmentation)\n", diff --git a/sbin/fsck/setup.c b/sbin/fsck/setup.c index ab143e1..bec9a31 100644 --- a/sbin/fsck/setup.c +++ b/sbin/fsck/setup.c @@ -145,10 +145,6 @@ setup(dev) pwarn("USING ALTERNATE SUPERBLOCK AT %d\n", bflag); bflag = 0; } - if (skipclean && sblock.fs_clean) { - pwarn("FILESYSTEM CLEAN; SKIPPING CHECKS\n"); - return (-1); - } maxfsblock = sblock.fs_size; maxino = sblock.fs_ncg * sblock.fs_ipg; /* @@ -265,6 +261,12 @@ setup(dev) } } /* + * If we survive the above basic checks and are preening, + * quit here unless forced. + */ + if (skipclean && sblock.fs_clean && !fflag) + return (-1); + /* * allocate and initialize the necessary maps */ bmapsize = roundup(howmany(maxfsblock, NBBY), sizeof(short)); diff --git a/sbin/fsck_ffs/main.c b/sbin/fsck_ffs/main.c index b7343da..fbeb3ee 100644 --- a/sbin/fsck_ffs/main.c +++ b/sbin/fsck_ffs/main.c @@ -197,10 +197,6 @@ checkfilesys(filesys, mntpt, auxdata, child) pfatal("CAN'T CHECK FILE SYSTEM."); /* fall through */ case -1: - return (0); - } - - if (preen && sblock.fs_clean && !fflag) { pwarn("clean, %ld free ", sblock.fs_cstotal.cs_nffree + sblock.fs_frag * sblock.fs_cstotal.cs_nbfree); printf("(%ld frags, %ld blocks, %.1f%% fragmentation)\n", diff --git a/sbin/fsck_ffs/setup.c b/sbin/fsck_ffs/setup.c index ab143e1..bec9a31 100644 --- a/sbin/fsck_ffs/setup.c +++ b/sbin/fsck_ffs/setup.c @@ -145,10 +145,6 @@ setup(dev) pwarn("USING ALTERNATE SUPERBLOCK AT %d\n", bflag); bflag = 0; } - if (skipclean && sblock.fs_clean) { - pwarn("FILESYSTEM CLEAN; SKIPPING CHECKS\n"); - return (-1); - } maxfsblock = sblock.fs_size; maxino = sblock.fs_ncg * sblock.fs_ipg; /* @@ -265,6 +261,12 @@ setup(dev) } } /* + * If we survive the above basic checks and are preening, + * quit here unless forced. + */ + if (skipclean && sblock.fs_clean && !fflag) + return (-1); + /* * allocate and initialize the necessary maps */ bmapsize = roundup(howmany(maxfsblock, NBBY), sizeof(short)); diff --git a/sbin/fsck_ifs/main.c b/sbin/fsck_ifs/main.c index b7343da..fbeb3ee 100644 --- a/sbin/fsck_ifs/main.c +++ b/sbin/fsck_ifs/main.c @@ -197,10 +197,6 @@ checkfilesys(filesys, mntpt, auxdata, child) pfatal("CAN'T CHECK FILE SYSTEM."); /* fall through */ case -1: - return (0); - } - - if (preen && sblock.fs_clean && !fflag) { pwarn("clean, %ld free ", sblock.fs_cstotal.cs_nffree + sblock.fs_frag * sblock.fs_cstotal.cs_nbfree); printf("(%ld frags, %ld blocks, %.1f%% fragmentation)\n", diff --git a/sbin/fsck_ifs/setup.c b/sbin/fsck_ifs/setup.c index ab143e1..bec9a31 100644 --- a/sbin/fsck_ifs/setup.c +++ b/sbin/fsck_ifs/setup.c @@ -145,10 +145,6 @@ setup(dev) pwarn("USING ALTERNATE SUPERBLOCK AT %d\n", bflag); bflag = 0; } - if (skipclean && sblock.fs_clean) { - pwarn("FILESYSTEM CLEAN; SKIPPING CHECKS\n"); - return (-1); - } maxfsblock = sblock.fs_size; maxino = sblock.fs_ncg * sblock.fs_ipg; /* @@ -265,6 +261,12 @@ setup(dev) } } /* + * If we survive the above basic checks and are preening, + * quit here unless forced. + */ + if (skipclean && sblock.fs_clean && !fflag) + return (-1); + /* * allocate and initialize the necessary maps */ bmapsize = roundup(howmany(maxfsblock, NBBY), sizeof(short)); |
