git: 166926a3dee0 - stable/13 - Have fsck_ffs(8) properly correct superblock check-hash failures.

The branch stable/13 has been updated by mckusick:

URL: https://cgit.FreeBSD.org/src/commit/?id=166926a3dee05875b9cb38356871d9ce07083c0d

commit 166926a3dee05875b9cb38356871d9ce07083c0d
Author:     Kirk McKusick <mckusick@FreeBSD.org>
AuthorDate: 2022-02-16 01:09:07 +0000
Commit:     Kirk McKusick <mckusick@FreeBSD.org>
CommitDate: 2022-02-16 01:14:22 +0000

    Have fsck_ffs(8) properly correct superblock check-hash failures.
    
    cherry pick cleanups from commit c0bfa109b942659f609b7e2bf3ba042ec0cb3f9d
    
    PR:           245916
---
 sbin/fsck_ffs/main.c  | 2 +-
 sbin/fsck_ffs/setup.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sbin/fsck_ffs/main.c b/sbin/fsck_ffs/main.c
index f7224b48a9a4..7c16f9c9737d 100644
--- a/sbin/fsck_ffs/main.c
+++ b/sbin/fsck_ffs/main.c
@@ -588,7 +588,7 @@ setup_bkgrdchk(struct statfs *mntp, int sbreadfailed, char **filesys)
 	struct iovec *iov;
 	char errmsg[255];
 	int iovlen;
-	long size;
+	size_t size;
 
 	/* Get the mount point information of the file system */
 	if (mntp == NULL) {
diff --git a/sbin/fsck_ffs/setup.c b/sbin/fsck_ffs/setup.c
index 506a027f40ac..87676e8ca7ce 100644
--- a/sbin/fsck_ffs/setup.c
+++ b/sbin/fsck_ffs/setup.c
@@ -221,14 +221,14 @@ readsb(int listerr)
 	struct fs *fs;
 
 	super = bflag ? bflag * dev_bsize :
-	    sbhashfailed ? STDSB_NOHASHFAIL_NOMSG : STDSB_NOMSG;
+	    sbhashfailed ? STDSB_NOHASHFAIL : STDSB;
 	readcnt[sblk.b_type]++;
 	while ((ret = sbget(fsreadfd, &fs, super)) != 0) {
 		switch (ret) {
 		case EINTEGRITY:
-			if (bflag || super == STDSB_NOHASHFAIL_NOMSG)
+			if (bflag || super == STDSB_NOHASHFAIL)
 				return (0);
-			super = STDSB_NOHASHFAIL_NOMSG;
+			super = STDSB_NOHASHFAIL;
 			sbhashfailed = 1;
 			continue;
 		case ENOENT: