Nuke last of the illusionary 'dev_bsize' and 'dev_bshift' variables in

favour of DEV_BSIZE. No-op on 512-byte sector devices.

5 files changed, 38 insertions, 44 deletions

diff --git a/sbin/dump/dump.h b/sbin/dump/dump.h
index 401722d4f3c..3c172247c92 100644
--- a/sbin/dump/dump.h
+++ b/sbin/dump/dump.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dump.h,v 1.18 2014/05/21 17:38:30 krw Exp $	*/
+/*	$OpenBSD: dump.h,v 1.19 2014/05/24 21:49:09 krw Exp $	*/
 /*	$NetBSD: dump.h,v 1.11 1997/06/05 11:13:20 lukem Exp $	*/
 
 /*-
@@ -79,8 +79,6 @@ time_t	tstart_writing;	/* when started writing the first tape block */
 long	xferrate;	/* averaged transfer rate of all volumes */
 struct	fs *sblock;	/* the file system super block */
 char	sblock_buf[MAXBSIZE];
-long	dev_bsize;	/* block size of underlying disk device */
-int	dev_bshift;	/* log2(dev_bsize) */
 int	tp_bshift;	/* log2(TP_BSIZE) */
 
 /* operator interface functions */
diff --git a/sbin/dump/main.c b/sbin/dump/main.c
index feb245b3675..c985a132ce1 100644
--- a/sbin/dump/main.c
+++ b/sbin/dump/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.46 2013/04/16 18:17:39 deraadt Exp $	*/
+/*	$OpenBSD: main.c,v 1.47 2014/05/24 21:49:09 krw Exp $	*/
 /*	$NetBSD: main.c,v 1.14 1997/06/05 11:13:24 lukem Exp $	*/
 
 /*-
@@ -61,7 +61,6 @@ int	tapeno = 0;	/* current tape number */
 int	density = 0;	/* density in bytes/0.1" */
 int	ntrec = NTREC;	/* # tape blocks in each tape record */
 int	cartridge = 0;	/* Assume non-cartridge tape */
-long	dev_bsize = 1;	/* recalculated below */
 long	blocksperfile;	/* output blocks per file */
 char	*host = NULL;	/* remote host (if any) */
 int	maxbsize = 64*1024;	/* XXX MAXBSIZE from sys/param.h */
@@ -396,10 +395,6 @@ main(int argc, char *argv[])
 	}
 	if (sblock_try[i] == -1)
 		quit("Cannot find filesystem superblock\n");
-	dev_bsize = sblock->fs_fsize / fsbtodb(sblock, 1);
-	dev_bshift = ffs(dev_bsize) - 1;
-	if (dev_bsize != (1 << dev_bshift))
-		quit("dev_bsize (%d) is not a power of 2\n", dev_bsize);
 	tp_bshift = ffs(TP_BSIZE) - 1;
 	if (TP_BSIZE != (1 << tp_bshift))
 		quit("TP_BSIZE (%d) is not a power of 2\n", TP_BSIZE);
diff --git a/sbin/dump/tape.c b/sbin/dump/tape.c
index 2b001f38da2..a64bd6b9fbf 100644
--- a/sbin/dump/tape.c
+++ b/sbin/dump/tape.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tape.c,v 1.38 2013/11/12 04:59:02 deraadt Exp $	*/
+/*	$OpenBSD: tape.c,v 1.39 2014/05/24 21:49:09 krw Exp $	*/
 /*	$NetBSD: tape.c,v 1.11 1997/06/05 11:13:26 lukem Exp $	*/
 
 /*-
@@ -182,7 +182,7 @@ dumpblock(daddr_t blkno, int size)
 		spcl.c_tapea += avail;
 		if (trecno >= ntrec)
 			flushtape();
-		dblkno += avail << (tp_bshift - dev_bshift);
+		dblkno += avail << (tp_bshift - (ffs(DEV_BSIZE) - 1));
 		tpblks -= avail;
 	}
 }
diff --git a/sbin/dump/traverse.c b/sbin/dump/traverse.c
index 7aa52bef0d9..74dcc34a565 100644
--- a/sbin/dump/traverse.c
+++ b/sbin/dump/traverse.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: traverse.c,v 1.30 2014/05/21 17:38:30 krw Exp $	*/
+/*	$OpenBSD: traverse.c,v 1.31 2014/05/24 21:49:09 krw Exp $	*/
 /*	$NetBSD: traverse.c,v 1.17 1997/06/05 11:13:27 lukem Exp $	*/
 
 /*-
@@ -801,25 +801,27 @@ int	breaderrors = 0;
 void
 bread(daddr_t blkno, char *buf, int size)
 {
+	off_t offset;
 	int cnt, i;
 
+	offset = blkno * DEV_BSIZE;
+
 loop:
-	if ((cnt = pread(diskfd, buf, size, (off_t)blkno << dev_bshift)) ==
-		size)
+	if ((cnt = pread(diskfd, buf, size, offset)) == size)
 		return;
-	if (blkno + (size / dev_bsize) >
+	if (blkno + (size / DEV_BSIZE) >
 	    fsbtodb(sblock, sblock->fs_ffs1_size)) {
 		/*
 		 * Trying to read the final fragment.
 		 *
 		 * NB - dump only works in TP_BSIZE blocks, hence
-		 * rounds `dev_bsize' fragments up to TP_BSIZE pieces.
+		 * rounds `DEV_BSIZE' fragments up to TP_BSIZE pieces.
 		 * It should be smarter about not actually trying to
 		 * read more than it can get, but for the time being
 		 * we punt and scale back the read only when it gets
 		 * us into trouble. (mkm 9/25/83)
 		 */
-		size -= dev_bsize;
+		size -= DEV_BSIZE;
 		goto loop;
 	}
 	if (cnt == -1)
@@ -843,17 +845,18 @@ loop:
 	 * Zero buffer, then try to read each sector of buffer separately.
 	 */
 	memset(buf, 0, size);
-	for (i = 0; i < size; i += dev_bsize, buf += dev_bsize, blkno++) {
-		if ((cnt = pread(diskfd, buf, dev_bsize,
-			    (off_t)blkno << dev_bshift)) == dev_bsize)
+	for (i = 0; i < size; i += DEV_BSIZE, buf += DEV_BSIZE) {
+		if ((cnt = pread(diskfd, buf, DEV_BSIZE, offset + i)) ==
+		    DEV_BSIZE)
 			continue;
 		if (cnt == -1) {
 			msg("read error from %s: %s: [sector %lld]: "
-			    "count=%ld\n", disk, strerror(errno), blkno,
-			    dev_bsize);
+			    "count=%d\n", disk, strerror(errno),
+			    (long long)(offset + i) / DEV_BSIZE, DEV_BSIZE);
 			continue;
 		}
-		msg("short read error from %s: [sector %lld]: count=%ld, "
-		    "got=%d\n", disk, blkno, dev_bsize, cnt);
+		msg("short read error from %s: [sector %lld]: count=%d, "
+		    "got=%d\n", disk, (long long)(offset + i) / DEV_BSIZE,
+		    DEV_BSIZE, cnt);
 	}
 }
diff --git a/sbin/ncheck_ffs/ncheck_ffs.c b/sbin/ncheck_ffs/ncheck_ffs.c
index 712ebb6152a..24685e0cc34 100644
--- a/sbin/ncheck_ffs/ncheck_ffs.c
+++ b/sbin/ncheck_ffs/ncheck_ffs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ncheck_ffs.c,v 1.43 2014/05/22 02:15:54 krw Exp $	*/
+/*	$OpenBSD: ncheck_ffs.c,v 1.44 2014/05/24 21:49:09 krw Exp $	*/
 
 /*-
  * Copyright (c) 1995, 1996 SigmaSoft, Th. Lockert <tholo@sigmasoft.com>
@@ -82,8 +82,6 @@ int	diskfd;		/* disk file descriptor */
 struct	fs *sblock;	/* the file system super block */
 char	sblock_buf[MAXBSIZE];
 int	sblock_try[] = SBLOCKSEARCH; /* possible superblock locations */
-long	dev_bsize;	/* block size of underlying disk device */
-int	dev_bshift;	/* log2(dev_bsize) */
 ufsino_t *ilist;	/* list of inodes to check */
 int	ninodes;	/* number of inodes in list */
 int	sflag;		/* only suid and special files */
@@ -264,24 +262,27 @@ int	breaderrors = 0;
 void
 bread(daddr_t blkno, char *buf, int size)
 {
-	int cnt, i;
+	off_t offset;
+ 	int cnt, i;
+
+	offset = blkno * DEV_BSIZE;
 
 loop:
-	if ((cnt = pread(diskfd, buf, size, (off_t)blkno << dev_bshift)) ==
-	    size)
+	if ((cnt = pread(diskfd, buf, size, offset)) == size)
 		return;
-	if (blkno + (size / dev_bsize) > fsbtodb(sblock, sblock->fs_ffs1_size)) {
+	if (blkno + (size / DEV_BSIZE) >
+	    fsbtodb(sblock, sblock->fs_ffs1_size)) {
 		/*
 		 * Trying to read the final fragment.
 		 *
 		 * NB - dump only works in TP_BSIZE blocks, hence
-		 * rounds `dev_bsize' fragments up to TP_BSIZE pieces.
+		 * rounds `DEV_BSIZE' fragments up to TP_BSIZE pieces.
 		 * It should be smarter about not actually trying to
 		 * read more than it can get, but for the time being
 		 * we punt and scale back the read only when it gets
 		 * us into trouble. (mkm 9/25/83)
 		 */
-		size -= dev_bsize;
+		size -= DEV_BSIZE;
 		goto loop;
 	}
 	if (cnt == -1)
@@ -297,18 +298,19 @@ loop:
 	 * Zero buffer, then try to read each sector of buffer separately.
 	 */
 	memset(buf, 0, size);
-	for (i = 0; i < size; i += dev_bsize, buf += dev_bsize, blkno++) {
-		if ((cnt = pread(diskfd, buf, (int)dev_bsize,
-			    (off_t)blkno << dev_bshift)) == dev_bsize)
+	for (i = 0; i < size; i += DEV_BSIZE, buf += DEV_BSIZE) {
+		if ((cnt = pread(diskfd, buf, DEV_BSIZE, offset + i)) ==
+		    DEV_BSIZE)
 			continue;
 		if (cnt == -1) {
 			warnx("read error from %s: %s: [sector %lld]: "
-			    "count=%ld", disk, strerror(errno),
-			    (long long)blkno, dev_bsize);
+			    "count=%d", disk, strerror(errno),
+			    (long long)(offset + i) / DEV_BSIZE, DEV_BSIZE);
 			continue;
 		}
-		warnx("short read error from %s: [sector %lld]: count=%ld, "
-		    "got=%d", disk, (long long)blkno, dev_bsize, cnt);
+		warnx("short read error from %s: [sector %lld]: count=%d, "
+		    "got=%d", disk, (long long)(offset + i) / DEV_BSIZE,
+		    DEV_BSIZE, cnt);
 	}
 }
 
@@ -579,10 +581,6 @@ main(int argc, char *argv[])
 	if (sblock_try[i] == -1)
 		errx(1, "cannot find filesystem superblock");
 
-	dev_bsize = sblock->fs_fsize / fsbtodb(sblock, 1);
-	dev_bshift = ffs(dev_bsize) - 1;
-	if (dev_bsize != (1 << dev_bshift))
-		errx(2, "blocksize (%ld) not a power of 2", dev_bsize);
 	findinodes(sblock->fs_ipg * sblock->fs_ncg);
 	if (!format)
 		printf("%s:\n", disk);