From 293c7069350d409031eed89443f023a5a170693d Mon Sep 17 00:00:00 2001
From: Bill Joy <bill@ucbvax.Berkeley.EDU>
Date: Wed, 4 Jun 1980 21:41:09 -0800
Subject: [PATCH] reformat

SCCS-vsn: sys/sys/buf.h 3.3
SCCS-vsn: sys/ufs/ffs/dinode.h 3.4
SCCS-vsn: sys/ufs/ffs/inode.h 3.4
SCCS-vsn: sys/ufs/ufs/dinode.h 3.4
SCCS-vsn: sys/ufs/ufs/inode.h 3.4
SCCS-vsn: sys/sys/vcmd.h 3.2
SCCS-vsn: sys/vax/uba/dh.c 3.10
SCCS-vsn: sys/vax/mba/ht.c 3.3
SCCS-vsn: sys/vm/vm_meter.c 3.3
SCCS-vsn: sys/vax/uba/va.c 3.3
SCCS-vsn: sys/vax/uba/va.c 3.4
---
 usr/src/sys/sys/buf.h        | 34 +++++++++++++++++-----------------
 usr/src/sys/sys/vcmd.h       | 10 +++++-----
 usr/src/sys/ufs/ffs/dinode.h |  4 ++--
 usr/src/sys/ufs/ffs/inode.h  |  4 ++--
 usr/src/sys/ufs/ufs/dinode.h |  4 ++--
 usr/src/sys/ufs/ufs/inode.h  |  4 ++--
 usr/src/sys/vax/mba/ht.c     | 13 ++++++-------
 usr/src/sys/vax/uba/dh.c     |  5 +++--
 usr/src/sys/vax/uba/va.c     |  2 +-
 usr/src/sys/vm/vm_meter.c    |  8 ++++----
 10 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/usr/src/sys/sys/buf.h b/usr/src/sys/sys/buf.h
index cd8913a6cc..de7d3dd29b 100644
--- a/usr/src/sys/sys/buf.h
+++ b/usr/src/sys/sys/buf.h
@@ -1,4 +1,4 @@
-/*	buf.h	3.2	%H%	*/
+/*	buf.h	3.3	%H%	*/
 
 /*
  * Each buffer in the pool is usually doubly linked into 2 lists:
@@ -67,22 +67,22 @@ unsigned minphys();
  * These flags are kept in b_flags.
  */
 #define	B_WRITE	 0x0000	/* non-read pseudo-flag */
-#define	B_READ	 0x0001	/* read when I/O occurs */
-#define	B_DONE	 0x0002	/* transaction finished */
-#define	B_ERROR	 0x0004	/* transaction aborted */
-#define	B_BUSY	 0x0008	/* not on av_forw/back list */
-#define	B_PHYS	 0x0010	/* Physical IO potentially using UNIBUS map */
-#define	B_MAP	 0x0020	/* This block has the UNIBUS map allocated */
-#define	B_WANTED 0x0040	/* issue wakeup when BUSY goes off */
-#define	B_AGE	 0x0080	/* delayed write for correct aging */
-#define	B_ASYNC	 0x0100	/* don't wait for I/O completion */
-#define	B_DELWRI 0x0200	/* don't write till block leaves available list */
-#define	B_TAPE	 0x0400	/* this is a magtape (no bdwrite) */
-#define	B_UAREA  0x0800	/* add u-area to a swap operation */
-#define	B_PAGET	 0x1000	/* page in/out of page table space */
-#define	B_DIRTY	 0x2000	/* dirty page to be pushed out async */
-#define	B_PGIN	 0x4000 /* page in flag to swap(), for counting */
-#define	B_CACHE	 0x8000	/* did bread find this block in the cache? */
+#define	B_READ		0x0001	/* read when I/O occurs */
+#define	B_DONE		0x0002	/* transaction finished */
+#define	B_ERROR		0x0004	/* transaction aborted */
+#define	B_BUSY		0x0008	/* not on av_forw/back list */
+#define	B_PHYS		0x0010	/* physical IO */
+#define	B_MAP		0x0020	/* UNIBUS map allocated */
+#define	B_WANTED	0x0040	/* issue wakeup when BUSY goes off */
+#define	B_AGE		0x0080	/* delayed write for correct aging */
+#define	B_ASYNC		0x0100	/* don't wait for I/O completion */
+#define	B_DELWRI	0x0200	/* write at exit of avail list */
+#define	B_TAPE		0x0400	/* this is a magtape (no bdwrite) */
+#define	B_UAREA		0x0800	/* add u-area to a swap operation */
+#define	B_PAGET		0x1000	/* page in/out of page table space */
+#define	B_DIRTY		0x2000	/* dirty page to be pushed out async */
+#define	B_PGIN		0x4000	/* pagein op, so swap() can count it */
+#define	B_CACHE		0x8000	/* did bread find us in the cache ? */
 
 /*
  * special redeclarations for
diff --git a/usr/src/sys/sys/vcmd.h b/usr/src/sys/sys/vcmd.h
index 28978380ec..9ea4248522 100644
--- a/usr/src/sys/sys/vcmd.h
+++ b/usr/src/sys/sys/vcmd.h
@@ -1,8 +1,8 @@
-/*	vcmd.h	3.1	%H%	*/
+/*	vcmd.h	3.2	%H%	*/
 
-#define VPRINT		0100
+#define	VPRINT		0100
 #define	VPLOT		0200
-#define VPRINTPLOT	0400
+#define	VPRINTPLOT	0400
 
-#define VGETSTATE	(('v'<<8)|0)
-#define VSETSTATE	(('v'<<8)|1)
+#define	VGETSTATE	(('v'<<8)|0)
+#define	VSETSTATE	(('v'<<8)|1)
diff --git a/usr/src/sys/ufs/ffs/dinode.h b/usr/src/sys/ufs/ffs/dinode.h
index 55b8d85e76..56e811cc7d 100644
--- a/usr/src/sys/ufs/ffs/dinode.h
+++ b/usr/src/sys/ufs/ffs/dinode.h
@@ -1,4 +1,4 @@
-/*	dinode.h	3.3	%H%	*/
+/*	dinode.h	3.4	%H%	*/
 
 /*
  * The I node is the focus of all
@@ -40,7 +40,7 @@ struct	inode
 	union {
 		struct {
 			daddr_t	I_addr[NADDR];	/* if normal file/directory */
-			daddr_t	I_lastr;	/* last logical block read (for read-ahead) */
+			daddr_t	I_last bnor;	/* last read (for read-ahead) */
 		} i_f;
 #define	i_addr	i_f.I_addr
 #define	i_lastr	i_f.I_lastr
diff --git a/usr/src/sys/ufs/ffs/inode.h b/usr/src/sys/ufs/ffs/inode.h
index b854583a1f..5bd311c6a3 100644
--- a/usr/src/sys/ufs/ffs/inode.h
+++ b/usr/src/sys/ufs/ffs/inode.h
@@ -1,4 +1,4 @@
-/*	inode.h	3.3	%H%	*/
+/*	inode.h	3.4	%H%	*/
 
 /*
  * The I node is the focus of all
@@ -40,7 +40,7 @@ struct	inode
 	union {
 		struct {
 			daddr_t	I_addr[NADDR];	/* if normal file/directory */
-			daddr_t	I_lastr;	/* last logical block read (for read-ahead) */
+			daddr_t	I_last bnor;	/* last read (for read-ahead) */
 		} i_f;
 #define	i_addr	i_f.I_addr
 #define	i_lastr	i_f.I_lastr
diff --git a/usr/src/sys/ufs/ufs/dinode.h b/usr/src/sys/ufs/ufs/dinode.h
index 55b8d85e76..56e811cc7d 100644
--- a/usr/src/sys/ufs/ufs/dinode.h
+++ b/usr/src/sys/ufs/ufs/dinode.h
@@ -1,4 +1,4 @@
-/*	dinode.h	3.3	%H%	*/
+/*	dinode.h	3.4	%H%	*/
 
 /*
  * The I node is the focus of all
@@ -40,7 +40,7 @@ struct	inode
 	union {
 		struct {
 			daddr_t	I_addr[NADDR];	/* if normal file/directory */
-			daddr_t	I_lastr;	/* last logical block read (for read-ahead) */
+			daddr_t	I_last bnor;	/* last read (for read-ahead) */
 		} i_f;
 #define	i_addr	i_f.I_addr
 #define	i_lastr	i_f.I_lastr
diff --git a/usr/src/sys/ufs/ufs/inode.h b/usr/src/sys/ufs/ufs/inode.h
index b854583a1f..5bd311c6a3 100644
--- a/usr/src/sys/ufs/ufs/inode.h
+++ b/usr/src/sys/ufs/ufs/inode.h
@@ -1,4 +1,4 @@
-/*	inode.h	3.3	%H%	*/
+/*	inode.h	3.4	%H%	*/
 
 /*
  * The I node is the focus of all
@@ -40,7 +40,7 @@ struct	inode
 	union {
 		struct {
 			daddr_t	I_addr[NADDR];	/* if normal file/directory */
-			daddr_t	I_lastr;	/* last logical block read (for read-ahead) */
+			daddr_t	I_last bnor;	/* last read (for read-ahead) */
 		} i_f;
 #define	i_addr	i_f.I_addr
 #define	i_lastr	i_f.I_lastr
diff --git a/usr/src/sys/vax/mba/ht.c b/usr/src/sys/vax/mba/ht.c
index a4736135ae..443ac16ce8 100644
--- a/usr/src/sys/vax/mba/ht.c
+++ b/usr/src/sys/vax/mba/ht.c
@@ -1,4 +1,4 @@
-/*	ht.c	3.2	%H%	*/
+/*	ht.c	3.3	%H%	*/
 
 /*
  * TJU16 tape driver
@@ -109,8 +109,6 @@ htclose(dev, flag)
 		(void) hcommand(dev, WEOF);
 		(void) hcommand(dev, SREV);
 	}
-/*	(void) hcommand(dev, REW);	*/
-/* for 'mtm' file positioning */
 	if((minor(dev)&4) == 0) /* no 4 -> rewind */
 		(void) hcommand(dev, REW);
 	h_openf[unit] = 0;
@@ -307,16 +305,17 @@ htintr(mbastat, as)
 
 	case SSFOR:
 	case SSREV:
+#define blk dbtofsb(bp->b_blkno)
 		if(HTADDR->htds & TM) {
 			if(state == SSREV) {
-				h_nxrec[unit] = dbtofsb(bp->b_blkno) - (HTADDR->htfc&0xffff);
+				h_nxrec[unit] = blk - (HTADDR->htfc&0xffff);
 				h_blkno[unit] = h_nxrec[unit];
 			} else {
-				h_nxrec[unit] = dbtofsb(bp->b_blkno) + (HTADDR->htfc & 0xffff) - 1;
-				h_blkno[unit] = dbtofsb(bp->b_blkno) + (HTADDR->htfc & 0xffff);
+				h_nxrec[unit] = blk + (HTADDR->htfc&0xffff) - 1;
+				h_blkno[unit] = blk + (HTADDR->htfc & 0xffff);
 			}
 		} else
-			h_blkno[unit] = dbtofsb(bp->b_blkno);
+			h_blkno[unit] = blk;
 		break;
 
 	default:
diff --git a/usr/src/sys/vax/uba/dh.c b/usr/src/sys/vax/uba/dh.c
index 04932e3307..cc613fe6a4 100644
--- a/usr/src/sys/vax/uba/dh.c
+++ b/usr/src/sys/vax/uba/dh.c
@@ -1,4 +1,4 @@
-/*	dh.c	3.9	%H%	*/
+/*	dh.c	3.10	%H%	*/
 
 /*
  *	DH-11 driver
@@ -340,7 +340,8 @@ dhxint(dev)
 				tp->t_state &= ~FLUSH;
 			else {
 				addr->un.dhcsrl = (d&017)|IENAB;
-				ndflush(&tp->t_outq, (int)addr->dhcar-UBACVT(tp->t_outq.c_cf));
+				ndflush(&tp->t_outq,
+				    (int)addr->dhcar-UBACVT(tp->t_outq.c_cf));
 			}
 			if (tp->t_line)
 				(*linesw[tp->t_line].l_start)(tp);
diff --git a/usr/src/sys/vax/uba/va.c b/usr/src/sys/vax/uba/va.c
index b832d8a20e..4a462b8783 100644
--- a/usr/src/sys/vax/uba/va.c
+++ b/usr/src/sys/vax/uba/va.c
@@ -1,4 +1,4 @@
-/*	va.c	3.2	%H%	*/
+/*	va.c	3.4	%H%	*/
 
 #ifdef ERNIE
 #include "../h/param.h"
diff --git a/usr/src/sys/vm/vm_meter.c b/usr/src/sys/vm/vm_meter.c
index 118f2c5626..c4875c90e6 100644
--- a/usr/src/sys/vm/vm_meter.c
+++ b/usr/src/sys/vm/vm_meter.c
@@ -1,4 +1,4 @@
-/*	vm_meter.c	3.2	%H%	*/
+/*	vm_meter.c	3.3	%H%	*/
 
 #include "../h/param.h"
 #include "../h/systm.h"
@@ -100,8 +100,8 @@ loop:
 
 	case SRUN:
 		if ((rp->p_flag&SLOAD) == 0) {
-			rppri = rp->p_time - rp->p_swrss / nz((maxpgio/2) * CLSIZE) + rp->p_slptime
-			    - (rp->p_nice-NZERO)*8;
+			rppri = rp->p_time - rp->p_swrss / nz((maxpgio/2) * CLSIZE) +
+			    rp->p_slptime - (rp->p_nice-NZERO)*8;
 			if (rppri > outpri) {
 				if (rp->p_poip)
 					continue;
@@ -198,7 +198,7 @@ hardswap:
 		} else if (!sleeper && (rp->p_stat==SRUN||rp->p_stat==SSLEEP)) {
 			rppri = rp->p_rssize;
 			if (rp->p_textp)
-				rppri += rp->p_textp->x_rssize / rp->p_textp->x_ccount;
+				rppri += rp->p_textp->x_rssize/rp->p_textp->x_ccount;
 			if (biggot < nbig)
 				nbp = &bigp[biggot++];
 			else {
-- 
2.20.1