diff options
| author | Kirk McKusick <mckusick@FreeBSD.org> | 2020-01-06 21:23:14 +0000 |
|---|---|---|
| committer | Kirk McKusick <mckusick@FreeBSD.org> | 2020-01-06 21:23:14 +0000 |
| commit | 53e3b88a849c72677922274efe8cbb61d16f3bd0 (patch) | |
| tree | 2c631dfeac72a5c465bc6913702eb16079975e02 /sbin | |
| parent | 3e4525511e2596d9b8603382f79adbff9327e735 (diff) | |
| download | src-53e3b88a849c72677922274efe8cbb61d16f3bd0.tar.gz src-53e3b88a849c72677922274efe8cbb61d16f3bd0.zip | |
MFC of 356063
Do not ask to use journal in fsck_ffs if journal is out of date
Notes
Notes:
svn path=/stable/11/; revision=356428
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 244940158abd..59e083970a99 100644 --- a/sbin/fsck_ffs/main.c +++ b/sbin/fsck_ffs/main.c @@ -420,13 +420,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 b95f57090251..890317b4d67e 100644 --- a/sbin/fsck_ffs/suj.c +++ b/sbin/fsck_ffs/suj.c @@ -2726,6 +2726,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(). |