fixed fsdtodb() spuriously in trace() calls by removing

added a TR_SWAPIO for green.

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

diff --git a/usr/src/sys/kern/kern_physio.c b/usr/src/sys/kern/kern_physio.c
index 0eb0ff7..65da621 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.21    81/05/08        */
+/*     bio.c   4.21    81/05/08        */

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


@@ -202,7 +202,7 @@ register struct buf *bp;
        if ((flag&B_DELWRI) == 0)
                u.u_vm.vm_oublk++;              /* noone paid yet */
 #ifdef TRACE
        if ((flag&B_DELWRI) == 0)
                u.u_vm.vm_oublk++;              /* noone paid yet */
 #ifdef TRACE

-       trace(TR_BWRITE, bp->b_dev, dbtofsb(bp->b_blkno));
+       trace(TR_BWRITE, bp->b_dev, bp->b_blkno);

 #endif
        (*bdevsw[major(bp->b_dev)].d_strategy)(bp);
        if ((flag&B_ASYNC) == 0) {
 #endif
        (*bdevsw[major(bp->b_dev)].d_strategy)(bp);
        if ((flag&B_ASYNC) == 0) {


@@ -391,7 +391,7 @@ daddr_t blkno;
                goto loop;
        }
 #ifdef TRACE
                goto loop;
        }
 #ifdef TRACE

-       trace(TR_BRELSE, bp->b_dev, dbtofsb(bp->b_blkno));
+       trace(TR_BRELSE, bp->b_dev, bp->b_blkno);

 #endif
        bp->b_flags = B_BUSY;
        bp->b_back->b_forw = bp->b_forw;
 #endif
        bp->b_flags = B_BUSY;
        bp->b_back->b_forw = bp->b_forw;


@@ -433,7 +433,7 @@ loop:
                goto loop;
        }
 #ifdef TRACE
                goto loop;
        }
 #ifdef TRACE

-       trace(TR_BRELSE, bp->b_dev, dbtofsb(bp->b_blkno));
+       trace(TR_BRELSE, bp->b_dev, bp->b_blkno);

 #endif
        bp->b_flags = B_BUSY|B_INVAL;
        bp->b_back->b_forw = bp->b_forw;
 #endif
        bp->b_flags = B_BUSY|B_INVAL;
        bp->b_back->b_forw = bp->b_forw;


@@ -597,6 +597,9 @@ swap(p, dblkno, addr, nbytes, rdflg, flag, dev, pfcent)
                        swpf[bp - swbuf] = pfcent;
                        swsize[bp - swbuf] = nbytes;
                }
                        swpf[bp - swbuf] = pfcent;
                        swsize[bp - swbuf] = nbytes;
                }

+#ifdef TRACE
+               trace(TR_SWAPIO, dev, bp->b_blkno);
+#endif

                (*bdevsw[major(dev)].d_strategy)(bp);
                if (flag & B_DIRTY) {
                        if (c < nbytes)
                (*bdevsw[major(dev)].d_strategy)(bp);
                if (flag & B_DIRTY) {
                        if (c < nbytes)

diff --git a/usr/src/sys/kern/vfs_bio.c b/usr/src/sys/kern/vfs_bio.c
index 7889b1d..65da621 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.21    81/05/08        */
+/*     bio.c   4.21    81/05/08        */

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


@@ -202,7 +202,7 @@ register struct buf *bp;
        if ((flag&B_DELWRI) == 0)
                u.u_vm.vm_oublk++;              /* noone paid yet */
 #ifdef TRACE
        if ((flag&B_DELWRI) == 0)
                u.u_vm.vm_oublk++;              /* noone paid yet */
 #ifdef TRACE

-       trace(TR_BWRITE, bp->b_dev, dbtofsb(bp->b_blkno));
+       trace(TR_BWRITE, bp->b_dev, bp->b_blkno);

 #endif
        (*bdevsw[major(bp->b_dev)].d_strategy)(bp);
        if ((flag&B_ASYNC) == 0) {
 #endif
        (*bdevsw[major(bp->b_dev)].d_strategy)(bp);
        if ((flag&B_ASYNC) == 0) {


@@ -391,7 +391,7 @@ daddr_t blkno;
                goto loop;
        }
 #ifdef TRACE
                goto loop;
        }
 #ifdef TRACE

-       trace(TR_BRELSE, bp->b_dev, dbtofsb(bp->b_blkno));
+       trace(TR_BRELSE, bp->b_dev, bp->b_blkno);

 #endif
        bp->b_flags = B_BUSY;
        bp->b_back->b_forw = bp->b_forw;
 #endif
        bp->b_flags = B_BUSY;
        bp->b_back->b_forw = bp->b_forw;


@@ -433,7 +433,7 @@ loop:
                goto loop;
        }
 #ifdef TRACE
                goto loop;
        }
 #ifdef TRACE

-       trace(TR_BRELSE, bp->b_dev, dbtofsb(bp->b_blkno));
+       trace(TR_BRELSE, bp->b_dev, bp->b_blkno);

 #endif
        bp->b_flags = B_BUSY|B_INVAL;
        bp->b_back->b_forw = bp->b_forw;
 #endif
        bp->b_flags = B_BUSY|B_INVAL;
        bp->b_back->b_forw = bp->b_forw;


@@ -597,6 +597,9 @@ swap(p, dblkno, addr, nbytes, rdflg, flag, dev, pfcent)
                        swpf[bp - swbuf] = pfcent;
                        swsize[bp - swbuf] = nbytes;
                }
                        swpf[bp - swbuf] = pfcent;
                        swsize[bp - swbuf] = nbytes;
                }

+#ifdef TRACE
+               trace(TR_SWAPIO, dev, bp->b_blkno);
+#endif

                (*bdevsw[major(dev)].d_strategy)(bp);
                if (flag & B_DIRTY) {
                        if (c < nbytes)
                (*bdevsw[major(dev)].d_strategy)(bp);
                if (flag & B_DIRTY) {
                        if (c < nbytes)

diff --git a/usr/src/sys/kern/vfs_cluster.c b/usr/src/sys/kern/vfs_cluster.c
index 5740dbe..65da621 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.21    81/05/08        */
+/*     bio.c   4.21    81/05/08        */

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


@@ -202,7 +202,7 @@ register struct buf *bp;
        if ((flag&B_DELWRI) == 0)
                u.u_vm.vm_oublk++;              /* noone paid yet */
 #ifdef TRACE
        if ((flag&B_DELWRI) == 0)
                u.u_vm.vm_oublk++;              /* noone paid yet */
 #ifdef TRACE

-       trace(TR_BWRITE, bp->b_dev, dbtofsb(bp->b_blkno));
+       trace(TR_BWRITE, bp->b_dev, bp->b_blkno);

 #endif
        (*bdevsw[major(bp->b_dev)].d_strategy)(bp);
        if ((flag&B_ASYNC) == 0) {
 #endif
        (*bdevsw[major(bp->b_dev)].d_strategy)(bp);
        if ((flag&B_ASYNC) == 0) {


@@ -391,7 +391,7 @@ daddr_t blkno;
                goto loop;
        }
 #ifdef TRACE
                goto loop;
        }
 #ifdef TRACE

-       trace(TR_BRELSE, bp->b_dev, dbtofsb(bp->b_blkno));
+       trace(TR_BRELSE, bp->b_dev, bp->b_blkno);

 #endif
        bp->b_flags = B_BUSY;
        bp->b_back->b_forw = bp->b_forw;
 #endif
        bp->b_flags = B_BUSY;
        bp->b_back->b_forw = bp->b_forw;


@@ -433,7 +433,7 @@ loop:
                goto loop;
        }
 #ifdef TRACE
                goto loop;
        }
 #ifdef TRACE

-       trace(TR_BRELSE, bp->b_dev, dbtofsb(bp->b_blkno));
+       trace(TR_BRELSE, bp->b_dev, bp->b_blkno);

 #endif
        bp->b_flags = B_BUSY|B_INVAL;
        bp->b_back->b_forw = bp->b_forw;
 #endif
        bp->b_flags = B_BUSY|B_INVAL;
        bp->b_back->b_forw = bp->b_forw;


@@ -597,6 +597,9 @@ swap(p, dblkno, addr, nbytes, rdflg, flag, dev, pfcent)
                        swpf[bp - swbuf] = pfcent;
                        swsize[bp - swbuf] = nbytes;
                }
                        swpf[bp - swbuf] = pfcent;
                        swsize[bp - swbuf] = nbytes;
                }

+#ifdef TRACE
+               trace(TR_SWAPIO, dev, bp->b_blkno);
+#endif

                (*bdevsw[major(dev)].d_strategy)(bp);
                if (flag & B_DIRTY) {
                        if (c < nbytes)
                (*bdevsw[major(dev)].d_strategy)(bp);
                if (flag & B_DIRTY) {
                        if (c < nbytes)