diff options
| author | Kirk McKusick <mckusick@FreeBSD.org> | 2019-12-24 23:03:12 +0000 |
|---|---|---|
| committer | Kirk McKusick <mckusick@FreeBSD.org> | 2019-12-24 23:03:12 +0000 |
| commit | c094263a249be5fd9b28c81fdc6657db766451c5 (patch) | |
| tree | d99d7430aff2a37515ab8dd5fddc2e739cdb8a91 /sbin | |
| parent | 60fe78635842c71df02a3e473b21086527ae8d38 (diff) | |
Notes
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/fsck_ffs/main.c | 12 | ||||
| -rw-r--r-- | sbin/fsck_ffs/suj.c | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sbin/fsck_ffs/main.c b/sbin/fsck_ffs/main.c index 8a028ec97a49..6284ce1e5130 100644 --- a/sbin/fsck_ffs/main.c +++ b/sbin/fsck_ffs/main.c @@ -423,13 +423,11 @@ checkfilesys(char *filesys) */ if ((sblock.fs_flags & FS_SUJ) == FS_SUJ) { if ((sblock.fs_flags & FS_NEEDSFSCK) != FS_NEEDSFSCK && skipclean) { - if (preen || reply("USE JOURNAL")) { - if (suj_check(filesys) == 0) { - printf("\n***** FILE SYSTEM MARKED CLEAN *****\n"); - if (chkdoreload(mntp) == 0) - exit(0); - exit(4); - } + if (suj_check(filesys) == 0) { + printf("\n***** FILE SYSTEM MARKED CLEAN *****\n"); + if (chkdoreload(mntp) == 0) + exit(0); + exit(4); } printf("** Skipping journal, falling through to full fsck\n\n"); } diff --git a/sbin/fsck_ffs/suj.c b/sbin/fsck_ffs/suj.c index 0391f327c0f1..be742e1b6773 100644 --- a/sbin/fsck_ffs/suj.c +++ b/sbin/fsck_ffs/suj.c @@ -2720,6 +2720,8 @@ suj_check(const char *filesys) printf("** SU+J Recovering %s\n", filesys); if (suj_verifyino(jip) != 0) return (-1); + if (!preen && !reply("USE JOURNAL")) + return (-1); /* * Build a list of journal blocks in jblocks before parsing the * available journal blocks in with suj_read(). |