fix to incore()

SCCS-vsn: sys/kern/kern_physio.c 4.7
SCCS-vsn: sys/kern/vfs_bio.c 4.7
SCCS-vsn: sys/kern/vfs_cluster.c 4.7

diff --git a/usr/src/sys/kern/kern_physio.c b/usr/src/sys/kern/kern_physio.c
index 9c121a8..d3369e9 100644 (file)
--- a/usr/src/sys/kern/kern_physio.c
+++ b/usr/src/sys/kern/kern_physio.c
@@ -1,4 +1,4 @@
-/*     kern_physio.c   4.6     %G%     */
+/*     kern_physio.c   4.7     %G%     */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -36,8 +36,8 @@
 
 #define        BUFHSZ  63
 struct bufhd bufhash[BUFHSZ];
 
 #define        BUFHSZ  63
 struct bufhd bufhash[BUFHSZ];

-#define        BUFHASH(dev,blkno)      \
-               ((struct buf *)&bufhash[((int)dev+(int)blkno) % BUFHSZ])
+#define        BUFHASH(dev, dblkno)    \
+               ((struct buf *)&bufhash[((int)(dev)+(int)(dblkno)) % BUFHSZ])

 
 /*
  * Initialize hash links for buffers.
 
 /*
  * Initialize hash links for buffers.


@@ -299,7 +299,7 @@ daddr_t blkno;
        register struct buf *dp;
        register int dblkno = fsbtodb(blkno);
 
        register struct buf *dp;
        register int dblkno = fsbtodb(blkno);
 

-       dp = BUFHASH(dev, blkno);
+       dp = BUFHASH(dev, dblkno);

        for (bp = dp->b_forw; bp != dp; bp = bp->b_forw)
                if (bp->b_blkno == dblkno && bp->b_dev == dev &&
                    !(bp->b_flags & B_INVAL))
        for (bp = dp->b_forw; bp != dp; bp = bp->b_forw)
                if (bp->b_blkno == dblkno && bp->b_dev == dev &&
                    !(bp->b_flags & B_INVAL))

diff --git a/usr/src/sys/kern/vfs_bio.c b/usr/src/sys/kern/vfs_bio.c
index 6814c76..367bef3 100644 (file)
--- a/usr/src/sys/kern/vfs_bio.c
+++ b/usr/src/sys/kern/vfs_bio.c
@@ -1,4 +1,4 @@
-/*     vfs_bio.c       4.6     %G%     */
+/*     vfs_bio.c       4.7     %G%     */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -36,8 +36,8 @@
 
 #define        BUFHSZ  63
 struct bufhd bufhash[BUFHSZ];
 
 #define        BUFHSZ  63
 struct bufhd bufhash[BUFHSZ];

-#define        BUFHASH(dev,blkno)      \
-               ((struct buf *)&bufhash[((int)dev+(int)blkno) % BUFHSZ])
+#define        BUFHASH(dev, dblkno)    \
+               ((struct buf *)&bufhash[((int)(dev)+(int)(dblkno)) % BUFHSZ])

 
 /*
  * Initialize hash links for buffers.
 
 /*
  * Initialize hash links for buffers.


@@ -299,7 +299,7 @@ daddr_t blkno;
        register struct buf *dp;
        register int dblkno = fsbtodb(blkno);
 
        register struct buf *dp;
        register int dblkno = fsbtodb(blkno);
 

-       dp = BUFHASH(dev, blkno);
+       dp = BUFHASH(dev, dblkno);

        for (bp = dp->b_forw; bp != dp; bp = bp->b_forw)
                if (bp->b_blkno == dblkno && bp->b_dev == dev &&
                    !(bp->b_flags & B_INVAL))
        for (bp = dp->b_forw; bp != dp; bp = bp->b_forw)
                if (bp->b_blkno == dblkno && bp->b_dev == dev &&
                    !(bp->b_flags & B_INVAL))

diff --git a/usr/src/sys/kern/vfs_cluster.c b/usr/src/sys/kern/vfs_cluster.c
index 87503be..7aee2f7 100644 (file)
--- a/usr/src/sys/kern/vfs_cluster.c
+++ b/usr/src/sys/kern/vfs_cluster.c
@@ -1,4 +1,4 @@
-/*     vfs_cluster.c   4.6     %G%     */
+/*     vfs_cluster.c   4.7     %G%     */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -36,8 +36,8 @@
 
 #define        BUFHSZ  63
 struct bufhd bufhash[BUFHSZ];
 
 #define        BUFHSZ  63
 struct bufhd bufhash[BUFHSZ];

-#define        BUFHASH(dev,blkno)      \
-               ((struct buf *)&bufhash[((int)dev+(int)blkno) % BUFHSZ])
+#define        BUFHASH(dev, dblkno)    \
+               ((struct buf *)&bufhash[((int)(dev)+(int)(dblkno)) % BUFHSZ])

 
 /*
  * Initialize hash links for buffers.
 
 /*
  * Initialize hash links for buffers.


@@ -299,7 +299,7 @@ daddr_t blkno;
        register struct buf *dp;
        register int dblkno = fsbtodb(blkno);
 
        register struct buf *dp;
        register int dblkno = fsbtodb(blkno);
 

-       dp = BUFHASH(dev, blkno);
+       dp = BUFHASH(dev, dblkno);

        for (bp = dp->b_forw; bp != dp; bp = bp->b_forw)
                if (bp->b_blkno == dblkno && bp->b_dev == dev &&
                    !(bp->b_flags & B_INVAL))
        for (bp = dp->b_forw; bp != dp; bp = bp->b_forw)
                if (bp->b_blkno == dblkno && bp->b_dev == dev &&
                    !(bp->b_flags & B_INVAL))