6 files changed, 16 insertions, 17 deletions

diff --git a/sbin/dump/main.c b/sbin/dump/main.c
index 8752f2c1bea5..779db5fb4b43 100644
--- a/sbin/dump/main.c
+++ b/sbin/dump/main.c
@@ -457,7 +457,7 @@ main(int argc, char *argv[])
 		msgtail("to %s\n", tape);
 
 	sync();
-	if ((ret = sbget(diskfd, &sblock, STDSB)) != 0) {
+	if ((ret = sbget(diskfd, &sblock, UFS_STDSB, UFS_NOCSUM)) != 0) {
 		switch (ret) {
 		case ENOENT:
 			warn("Cannot find file system superblock");
diff --git a/sbin/dumpfs/dumpfs.c b/sbin/dumpfs/dumpfs.c
index 7f2acdf435ea..6a586ffb95ec 100644
--- a/sbin/dumpfs/dumpfs.c
+++ b/sbin/dumpfs/dumpfs.c
@@ -135,7 +135,7 @@ main(int argc, char *argv[])
 			eval |= 1;
 			continue;
 		}
-		disk.d_sblockloc = STDSB_NOHASHFAIL;
+		disk.d_lookupflags |= UFS_NOHASHFAIL;
 		if (sbread(&disk) == -1) {
 			ufserr(name);
 			eval |= 1;
@@ -314,9 +314,6 @@ dumpfs(const char *name, int dosb)
 		afs.fs_volname, (uintmax_t)afs.fs_swuid,
 		(uintmax_t)afs.fs_providersize);
 	printf("\ncs[].cs_(nbfree,ndir,nifree,nffree):\n\t");
-	afs.fs_csp = calloc(1, afs.fs_cssize);
-	if (bread(&disk, fsbtodb(&afs, afs.fs_csaddr), afs.fs_csp, afs.fs_cssize) == -1)
-		goto err;
 	for (i = 0; i < afs.fs_ncg; i++) {
 		struct csum *cs = &afs.fs_cs(&afs, i);
 		if (i && i % 4 == 0)
diff --git a/sbin/fsck_ffs/setup.c b/sbin/fsck_ffs/setup.c
index 0f0d9b61a076..0daac100499a 100644
--- a/sbin/fsck_ffs/setup.c
+++ b/sbin/fsck_ffs/setup.c
@@ -252,18 +252,20 @@ int
 readsb(int listerr)
 {
 	off_t super;
-	int bad, ret;
+	int bad, ret, flags;
 	struct fs *fs;
 
-	super = bflag ? bflag * dev_bsize :
-	    sbhashfailed ? STDSB_NOHASHFAIL_NOMSG : STDSB_NOMSG;
+	super = bflag ? bflag * dev_bsize : UFS_STDSB;
+	flags = sbhashfailed ? UFS_NOHASHFAIL | UFS_NOMSG : UFS_NOMSG;
 	readcnt[sblk.b_type]++;
-	while ((ret = sbget(fsreadfd, &fs, super)) != 0) {
+	while ((ret = sbget(fsreadfd, &fs, super, flags)) != 0) {
 		switch (ret) {
 		case EINTEGRITY:
-			if (bflag || super == STDSB_NOHASHFAIL_NOMSG)
+			if (bflag || (super == UFS_STDSB &&
+			    flags == (UFS_NOHASHFAIL | UFS_NOMSG)))
 				return (0);
-			super = STDSB_NOHASHFAIL_NOMSG;
+			super = UFS_STDSB;
+			flags = UFS_NOHASHFAIL | UFS_NOMSG;
 			sbhashfailed = 1;
 			continue;
 		case ENOENT:
diff --git a/sbin/fsirand/fsirand.c b/sbin/fsirand/fsirand.c
index c4db8848f18b..90305416f556 100644
--- a/sbin/fsirand/fsirand.c
+++ b/sbin/fsirand/fsirand.c
@@ -112,7 +112,7 @@ fsirand(char *device)
 	struct fs *sblock;
 	ino_t inumber;
 	ufs2_daddr_t dblk;
-	int devfd, n, cg, ret;
+	int devfd, n, cg;
 	u_int32_t bsize = DEV_BSIZE;
 
 	if ((devfd = open(device, printonly ? O_RDONLY : O_RDWR)) < 0) {
@@ -124,10 +124,10 @@ fsirand(char *device)
 	dp2 = NULL;
 
 	/* Read in master superblock */
-	if ((ret = sbget(devfd, &sblock, STDSB)) != 0) {
-		switch (ret) {
+	if ((errno = sbget(devfd, &sblock, UFS_STDSB, UFS_NOCSUM)) != 0) {
+		switch (errno) {
 		case ENOENT:
-			warn("Cannot find file system superblock");
+			warnx("Cannot find file system superblock");
 			return (1);
 		default:
 			warn("Unable to read file system superblock");
diff --git a/sbin/growfs/growfs.c b/sbin/growfs/growfs.c
index 69e6f04dd4c2..4a8d935d91c7 100644
--- a/sbin/growfs/growfs.c
+++ b/sbin/growfs/growfs.c
@@ -1455,7 +1455,7 @@ main(int argc, char **argv)
 	/*
 	 * Read the current superblock, and take a backup.
 	 */
-	if ((ret = sbget(fsi, &fs, STDSB)) != 0) {
+	if ((ret = sbget(fsi, &fs, UFS_STDSB, 0)) != 0) {
 		switch (ret) {
 		case ENOENT:
 			errx(1, "superblock not recognized");
diff --git a/sbin/quotacheck/quotacheck.c b/sbin/quotacheck/quotacheck.c
index 9a01be11d9d0..1e656d2a5811 100644
--- a/sbin/quotacheck/quotacheck.c
+++ b/sbin/quotacheck/quotacheck.c
@@ -321,7 +321,7 @@ chkquota(char *specname, struct quotafile *qfu, struct quotafile *qfg)
 		}
 	}
 	sync();
-	if ((ret = sbget(fi, &fs, STDSB)) != 0) {
+	if ((ret = sbget(fi, &fs, UFS_STDSB, UFS_NOCSUM)) != 0) {
 		switch (ret) {
 		case ENOENT:
 			warn("Cannot find file system superblock");