BSD 4_3_Net_2 release

[unix-history] / usr / src / sys / sys / buf.h

diff --git a/usr/src/sys/sys/buf.h b/usr/src/sys/sys/buf.h
index 8468523..5661986 100644 (file)
--- a/usr/src/sys/sys/buf.h
+++ b/usr/src/sys/sys/buf.h
@@ -2,9 +2,35 @@
  * Copyright (c) 1982, 1986, 1989 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1982, 1986, 1989 Regents of the University of California.
  * All rights reserved.
  *

- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.

  *
  *

- *     @(#)buf.h       7.11 (Berkeley) %G%
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *     @(#)buf.h       7.11 (Berkeley) 5/9/90

  */
 
 /*
  */
 
 /*


@@ -61,9 +87,6 @@ struct buf
        } b_un;
        daddr_t b_lblkno;               /* logical block number */
        daddr_t b_blkno;                /* block # on device */
        } b_un;
        daddr_t b_lblkno;               /* logical block number */
        daddr_t b_blkno;                /* block # on device */

-#ifdef SECSIZE
-       long    b_blksize;              /* size of device blocks */
-#endif SECSIZE

        long    b_resid;                /* words not transferred after error */
 #define        b_errcnt b_resid                /* while i/o in progress: # retries */
        struct  proc *b_proc;           /* proc doing physical or swap I/O */
        long    b_resid;                /* words not transferred after error */
 #define        b_errcnt b_resid                /* while i/o in progress: # retries */
        struct  proc *b_proc;           /* proc doing physical or swap I/O */


@@ -85,14 +108,8 @@ struct buf
 #define        BQ_EMPTY        3               /* buffer headers with no memory */
 
 #ifdef KERNEL
 #define        BQ_EMPTY        3               /* buffer headers with no memory */
 
 #ifdef KERNEL

-#ifdef SECSIZE
-#define        BUFHSZ          512
-#define        MINSECSIZE      512
-#define RND    (MAXBSIZE/MINSECSIZE)
-#else SECSIZE

 #define        BUFHSZ  512
 #define RND    (MAXBSIZE/DEV_BSIZE)
 #define        BUFHSZ  512
 #define RND    (MAXBSIZE/DEV_BSIZE)

-#endif SECSIZE

 #if    ((BUFHSZ&(BUFHSZ-1)) == 0)
 #define        BUFHASH(dvp, dblkno)    \
        ((struct buf *)&bufhash[((int)(dvp)+(((int)(dblkno))/RND))&(BUFHSZ-1)])
 #if    ((BUFHSZ&(BUFHSZ-1)) == 0)
 #define        BUFHASH(dvp, dblkno)    \
        ((struct buf *)&bufhash[((int)(dvp)+(((int)(dblkno))/RND))&(BUFHSZ-1)])