d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Properly recover from superblock check-hash failures. Specifically,

Browse Source 
report the check-hash failure and offer to search for and use
alternate superblocks.  Prior to this fix fsck_ffs would simply
report the check-hash failure and exit.

Reported by:  Julian H. Stacey <jhs@berklix.com>
Tested by:    Peter Holm
Sponsored by: Netflix
This commit is contained in:
Kirk McKusick 2018-11-25 18:09:39 +00:00
parent ade67b509c
commit 038c170fc2
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sbin/fsck_ffs/setup.c
View File

@ -127,7 +127,7 @@ setup(char *dev)
}
}
if ((fsreadfd = open(dev, O_RDONLY)) < 0 ||
ufs_disk_fillout(&disk, dev) < 0) {
ufs_disk_fillout_blank(&disk, dev) < 0) {
if (bkgrdflag) {
unlink(snapname);
bkgrdflag = 0;
@ -325,10 +325,8 @@ readsb(int listerr)
if ((ret = sbget(fsreadfd, &fs, super)) != 0) {
switch (ret) {
case EINVAL:
fprintf(stderr, "The previous newfs operation "
"on this volume did not complete.\nYou must "
"complete newfs before using this volume.\n");
exit(11);
/* Superblock check-hash failed */
return (0);
case ENOENT:
if (bflag)
fprintf(stderr, "%jd is not a file system "