delete VERBOSE #ifdef's

SCCS-vsn: sys/ufs/lfs/lfs_alloc.c 7.51
SCCS-vsn: sys/ufs/lfs/lfs_bio.c 7.14
SCCS-vsn: sys/ufs/lfs/lfs_balloc.c 7.35
SCCS-vsn: sys/ufs/lfs/lfs_inode.c 7.77
SCCS-vsn: sys/ufs/lfs/lfs_segment.c 7.28
SCCS-vsn: sys/ufs/lfs/lfs_syscalls.c 7.18
SCCS-vsn: sys/ufs/lfs/lfs_vnops.c 7.90

diff --git a/usr/src/sys/ufs/lfs/lfs_alloc.c b/usr/src/sys/ufs/lfs/lfs_alloc.c
index 817637f..09c0a5d 100644 (file)
--- a/usr/src/sys/ufs/lfs/lfs_alloc.c
+++ b/usr/src/sys/ufs/lfs/lfs_alloc.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)lfs_alloc.c 7.50 (Berkeley) %G%
+ *     @(#)lfs_alloc.c 7.51 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -47,9 +47,6 @@ lfs_valloc(ap)
        u_long i, max;
        int error;
 
        u_long i, max;
        int error;
 

-#ifdef VERBOSE
-       printf("lfs_valloc\n");
-#endif

        /* Get the head of the freelist. */
        fs = VTOI(ap->a_pvp)->i_lfs;
        new_ino = fs->lfs_free;
        /* Get the head of the freelist. */
        fs = VTOI(ap->a_pvp)->i_lfs;
        new_ino = fs->lfs_free;


@@ -136,9 +133,6 @@ lfs_vcreate(mp, ino, vpp)
        struct ufsmount *ump;
        int error, i;
 
        struct ufsmount *ump;
        int error, i;
 

-#ifdef VERBOSE
-       printf("lfs_vcreate: ino %d\n", ino);
-#endif

        /* Create the vnode. */
        if (error = getnewvnode(VT_LFS, mp, lfs_vnodeop_p, vpp)) {
                *vpp = NULL;
        /* Create the vnode. */
        if (error = getnewvnode(VT_LFS, mp, lfs_vnodeop_p, vpp)) {
                *vpp = NULL;


@@ -187,11 +181,8 @@ lfs_vfree(ap)
        daddr_t old_iaddr;
        ino_t ino;
 
        daddr_t old_iaddr;
        ino_t ino;
 

-       ip = VTOI(ap->a_pvp);
-#ifdef VERBOSE
-       printf("lfs_vfree: free %d\n", ip->i_number);
-#endif

        /* Get the inode number and file system. */
        /* Get the inode number and file system. */

+       ip = VTOI(ap->a_pvp);

        fs = ip->i_lfs;
        ino = ip->i_number;
 
        fs = ip->i_lfs;
        ino = ip->i_number;
 

diff --git a/usr/src/sys/ufs/lfs/lfs_balloc.c b/usr/src/sys/ufs/lfs/lfs_balloc.c
index ef5e3de..643df17 100644 (file)
--- a/usr/src/sys/ufs/lfs/lfs_balloc.c
+++ b/usr/src/sys/ufs/lfs/lfs_balloc.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)lfs_balloc.c        7.34 (Berkeley) %G%
+ *     @(#)lfs_balloc.c        7.35 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -40,9 +40,6 @@ lfs_bmap(ap)
                daddr_t *a_bnp;
        } */ *ap;
 {
                daddr_t *a_bnp;
        } */ *ap;
 {

-#ifdef VERBOSE
-       printf("lfs_bmap\n");
-#endif

        /*
         * Check for underlying vnode requests and ensure that logical
         * to physical mapping is requested.
        /*
         * Check for underlying vnode requests and ensure that logical
         * to physical mapping is requested.


@@ -91,9 +88,6 @@ lfs_bmaparray(vp, bn, bnp, ap, nump)
        struct vop_strategy_args vop_strategy_a;
 
        ip = VTOI(vp);
        struct vop_strategy_args vop_strategy_a;
 
        ip = VTOI(vp);

-#ifdef VERBOSE
-       printf("lfs_bmap: block number %d, inode %d\n", bn, ip->i_number);
-#endif

 #ifdef DIAGNOSTIC
        if (ap != NULL && nump == NULL || ap == NULL && nump != NULL)
                panic("lfs_bmaparray: invalid arguments");
 #ifdef DIAGNOSTIC
        if (ap != NULL && nump == NULL || ap == NULL && nump != NULL)
                panic("lfs_bmaparray: invalid arguments");


@@ -106,7 +100,6 @@ lfs_bmaparray(vp, bn, bnp, ap, nump)
                return (error);
 
        num = *nump;
                return (error);
 
        num = *nump;

-

        if (num == 0) {
                *bnp = ip->i_db[bn];
                if (*bnp == 0)
        if (num == 0) {
                *bnp = ip->i_db[bn];
                if (*bnp == 0)


@@ -192,9 +185,6 @@ lfs_getlbns(vp, bn, ap, nump)
        long metalbn, realbn;
        int j, numlevels, off, sh;
 
        long metalbn, realbn;
        int j, numlevels, off, sh;
 

-#ifdef VERBOSE
-       printf("lfs_getlbns: bn %d, inode %d\n", bn, VTOI(vp)->i_number);
-#endif

        if (nump)
                *nump = 0;
        numlevels = 0;
        if (nump)
                *nump = 0;
        numlevels = 0;

diff --git a/usr/src/sys/ufs/lfs/lfs_bio.c b/usr/src/sys/ufs/lfs/lfs_bio.c
index 5613edf..cc2c641 100644 (file)
--- a/usr/src/sys/ufs/lfs/lfs_bio.c
+++ b/usr/src/sys/ufs/lfs/lfs_bio.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)lfs_bio.c   7.13 (Berkeley) %G%
+ *     @(#)lfs_bio.c   7.14 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -38,9 +38,7 @@ lfs_bwrite(ap)
 {
        register struct buf *bp = ap->a_bp;
        int s;
 {
        register struct buf *bp = ap->a_bp;
        int s;

-#ifdef VERBOSE
-printf("lfs_bwrite\n");
-#endif
+

        /*
         * Set the delayed write flag and use reassignbuf to move the buffer
         * from the clean list to the dirty one.
        /*
         * Set the delayed write flag and use reassignbuf to move the buffer
         * from the clean list to the dirty one.

diff --git a/usr/src/sys/ufs/lfs/lfs_inode.c b/usr/src/sys/ufs/lfs/lfs_inode.c
index 0cafea6..b9f61d7 100644 (file)
--- a/usr/src/sys/ufs/lfs/lfs_inode.c
+++ b/usr/src/sys/ufs/lfs/lfs_inode.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)lfs_inode.c 7.76 (Berkeley) %G%
+ *     @(#)lfs_inode.c 7.77 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -30,9 +30,6 @@
 int
 lfs_init()
 {
 int
 lfs_init()
 {

-#ifdef VERBOSE
-       printf("lfs_init\n");
-#endif

        return (ufs_init());
 }
 
        return (ufs_init());
 }
 


@@ -46,9 +43,6 @@ lfs_ifind(fs, ino, dip)
        register int cnt;
        register struct dinode *ldip;
 
        register int cnt;
        register struct dinode *ldip;
 

-#ifdef VERBOSE
-       printf("lfs_ifind: inode %d\n", ino);
-#endif

        for (cnt = INOPB(fs), ldip = dip + (cnt - 1); cnt--; --ldip)
                if (ldip->di_inum == ino)
                        return (ldip);
        for (cnt = INOPB(fs), ldip = dip + (cnt - 1); cnt--; --ldip)
                if (ldip->di_inum == ino)
                        return (ldip);


@@ -69,9 +63,6 @@ lfs_update(ap)
        struct vnode *vp = ap->a_vp;
        struct inode *ip;
 
        struct vnode *vp = ap->a_vp;
        struct inode *ip;
 

-#ifdef VERBOSE
-       printf("lfs_update\n");
-#endif

        if (vp->v_mount->mnt_flag & MNT_RDONLY)
                return (0);
        ip = VTOI(vp);
        if (vp->v_mount->mnt_flag & MNT_RDONLY)
                return (0);
        ip = VTOI(vp);


@@ -145,9 +136,6 @@ lfs_truncate(ap)
        long off, blocksreleased;
        int e1, e2, depth, lastseg, num, offset, seg, size;
 
        long off, blocksreleased;
        int e1, e2, depth, lastseg, num, offset, seg, size;
 

-#ifdef VERBOSE
-       printf("lfs_truncate\n");
-#endif

        ip = VTOI(vp);
        tv = time;
        if (vp->v_type == VLNK && vp->v_mount->mnt_maxsymlinklen > 0) {
        ip = VTOI(vp);
        tv = time;
        if (vp->v_type == VLNK && vp->v_mount->mnt_maxsymlinklen > 0) {

diff --git a/usr/src/sys/ufs/lfs/lfs_segment.c b/usr/src/sys/ufs/lfs/lfs_segment.c
index b7f4dd1..5e2925a 100644 (file)
--- a/usr/src/sys/ufs/lfs/lfs_segment.c
+++ b/usr/src/sys/ufs/lfs/lfs_segment.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)lfs_segment.c       7.27 (Berkeley) %G%
+ *     @(#)lfs_segment.c       7.28 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -95,9 +95,6 @@ lfs_vflush(vp)
        struct segment *sp;
        int error, s;
 
        struct segment *sp;
        int error, s;
 

-#ifdef VERBOSE
-       printf("lfs_vflush\n");
-#endif

        fs = VFSTOUFS(vp->v_mount)->um_lfs;
        lfs_seglock(fs);
 
        fs = VFSTOUFS(vp->v_mount)->um_lfs;
        lfs_seglock(fs);
 


@@ -217,9 +214,6 @@ lfs_segwrite(mp, do_ckp)
        daddr_t ibno;
        int error, i, s;
 
        daddr_t ibno;
        int error, i, s;
 

-#ifdef VERBOSE
-       printf("lfs_segwrite\n");
-#endif

        fs = VFSTOUFS(mp)->um_lfs;
        lfs_seglock(fs);
 
        fs = VFSTOUFS(mp)->um_lfs;
        lfs_seglock(fs);
 


@@ -337,9 +331,6 @@ lfs_writefile(fs, sp, vp)
        struct finfo *fip;
        IFILE *ifp;
 
        struct finfo *fip;
        IFILE *ifp;
 

-#ifdef VERBOSE
-       printf("lfs_writefile\n");
-#endif

        if (sp->seg_bytes_left < fs->lfs_bsize ||
            sp->sum_bytes_left < sizeof(struct finfo)) {
                (void) lfs_writeseg(fs, sp);
        if (sp->seg_bytes_left < fs->lfs_bsize ||
            sp->sum_bytes_left < sizeof(struct finfo)) {
                (void) lfs_writeseg(fs, sp);


@@ -393,9 +384,6 @@ lfs_writeinode(fs, sp, ip)
        int ndx;
        int redo_ifile = 0;
 
        int ndx;
        int redo_ifile = 0;
 

-#ifdef VERBOSE
-       printf("lfs_writeinode\n");
-#endif

        /* Allocate a new inode block if necessary. */
        if (sp->ibp == NULL) {
                /* Allocate a new segment if necessary. */
        /* Allocate a new inode block if necessary. */
        if (sp->ibp == NULL) {
                /* Allocate a new segment if necessary. */


@@ -483,9 +471,6 @@ struct buf *lastbp;
        u_long version;
        int s;
 
        u_long version;
        int s;
 

-#ifdef VERBOSE
-       printf("lfs_gather\n");
-#endif

        ip = VTOI(vp);
        bpp = sp->cbpp;
        fip = sp->fip;
        ip = VTOI(vp);
        bpp = sp->cbpp;
        fip = sp->fip;


@@ -565,9 +550,6 @@ lfs_updatemeta(fs, sp, vp, lbp, bpp, nblocks)
        daddr_t daddr, lbn, off;
        int db_per_fsb, error, i, num;
 
        daddr_t daddr, lbn, off;
        int db_per_fsb, error, i, num;
 

-#ifdef VERBOSE
-       printf("lfs_updatemeta\n");
-#endif

        if (nblocks == 0)
                return;
 
        if (nblocks == 0)
                return;
 


@@ -641,9 +623,6 @@ lfs_initseg(fs, sp)
        struct buf *bp;
        daddr_t lbn, *lbnp;
 
        struct buf *bp;
        daddr_t lbn, *lbnp;
 

-#ifdef VERBOSE
-       printf("lfs_initseg\n");
-#endif

        /* Advance to the next segment. */
        if (!LFS_PARTIAL_FITS(fs)) {
                /* Wake up any cleaning procs waiting on this file system. */
        /* Advance to the next segment. */
        if (!LFS_PARTIAL_FITS(fs)) {
                /* Wake up any cleaning procs waiting on this file system. */


@@ -707,9 +686,6 @@ lfs_newseg(fs)
        struct buf *bp;
        int curseg, isdirty, sn;
 
        struct buf *bp;
        int curseg, isdirty, sn;
 

-#ifdef VERBOSE
-       printf("lfs_newseg\n");
-#endif

         LFS_SEGENTRY(sup, fs, datosn(fs, fs->lfs_nextseg), bp);
         sup->su_flags |= SEGUSE_DIRTY;
         LFS_UBWRITE(bp);
         LFS_SEGENTRY(sup, fs, datosn(fs, fs->lfs_nextseg), bp);
         sup->su_flags |= SEGUSE_DIRTY;
         LFS_UBWRITE(bp);


@@ -752,9 +728,6 @@ lfs_writeseg(fs, sp)
        u_short ninos;
        char *p;
 
        u_short ninos;
        char *p;
 

-#ifdef VERBOSE
-       printf("lfs_writeseg\n");
-#endif

        /* Checkpoint always writes superblock, even if no data blocks. */
        if ((nblocks = sp->cbpp - sp->bpp) == 0 && !(sp->seg_flags & SEGM_CKP))
                return (0);
        /* Checkpoint always writes superblock, even if no data blocks. */
        if ((nblocks = sp->cbpp - sp->bpp) == 0 && !(sp->seg_flags & SEGM_CKP))
                return (0);


@@ -858,9 +831,6 @@ lfs_writesuper(fs, sp)
        int (*strategy) __P((struct vop_strategy_args *));
        struct vop_strategy_args vop_strategy_a;
 
        int (*strategy) __P((struct vop_strategy_args *));
        struct vop_strategy_args vop_strategy_a;
 

-#ifdef VERBOSE
-       printf("lfs_writesuper\n");
-#endif

        i_dev = VTOI(fs->lfs_ivnode)->i_dev;
        strategy = VTOI(fs->lfs_ivnode)->i_devvp->v_op[VOFFSET(vop_strategy)];
 
        i_dev = VTOI(fs->lfs_ivnode)->i_dev;
        strategy = VTOI(fs->lfs_ivnode)->i_devvp->v_op[VOFFSET(vop_strategy)];
 


@@ -941,9 +911,6 @@ lfs_newbuf(fs, daddr, size)
 {
        struct buf *bp;
 
 {
        struct buf *bp;
 

-#ifdef VERBOSE
-       printf("lfs_newbuf\n");
-#endif

        bp = getnewbuf();
        bremhash(bp);
        bgetvp(fs->lfs_ivnode, bp);
        bp = getnewbuf();
        bremhash(bp);
        bgetvp(fs->lfs_ivnode, bp);

diff --git a/usr/src/sys/ufs/lfs/lfs_syscalls.c b/usr/src/sys/ufs/lfs/lfs_syscalls.c
index 0e07cb7..f0dea53 100644 (file)
--- a/usr/src/sys/ufs/lfs/lfs_syscalls.c
+++ b/usr/src/sys/ufs/lfs/lfs_syscalls.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)lfs_syscalls.c      7.17 (Berkeley) %G%
+ *     @(#)lfs_syscalls.c      7.18 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -61,9 +61,6 @@ lfs_markv(p, uap, retval)
        u_long bsize;
        int cnt, error;
 
        u_long bsize;
        int cnt, error;
 

-#ifdef VERBOSE
-       printf("lfs_markv\n");
-#endif

        if (error = suser(p->p_ucred, &p->p_acflag))
                return (error);
 
        if (error = suser(p->p_ucred, &p->p_acflag))
                return (error);
 


@@ -191,9 +188,6 @@ lfs_bmapv(p, uap, retval)
        daddr_t daddr;
        int cnt, error, step;
 
        daddr_t daddr;
        int cnt, error, step;
 

-#ifdef VERBOSE
-       printf("lfs_bmapv\n");
-#endif

        if (error = suser(p->p_ucred, &p->p_acflag))
                return (error);
 
        if (error = suser(p->p_ucred, &p->p_acflag))
                return (error);
 


@@ -246,9 +240,6 @@ lfs_segclean(p, uap, retval)
        struct lfs *fs;
        int error;
 
        struct lfs *fs;
        int error;
 

-#ifdef VERBOSE
-       printf("lfs_segclean\n");
-#endif

        if (error = suser(p->p_ucred, &p->p_acflag))
                return (error);
 
        if (error = suser(p->p_ucred, &p->p_acflag))
                return (error);
 


@@ -300,9 +291,6 @@ lfs_segwait(p, uap, retval)
        u_long timeout;
        int error, s;
 
        u_long timeout;
        int error, s;
 

-#ifdef VERBOSE
-       printf("lfs_segwait\n");
-#endif

        if (error = suser(p->p_ucred, &p->p_acflag))
                return (error);
 
        if (error = suser(p->p_ucred, &p->p_acflag))
                return (error);
 

diff --git a/usr/src/sys/ufs/lfs/lfs_vnops.c b/usr/src/sys/ufs/lfs/lfs_vnops.c
index 9948eff..050d680 100644 (file)
--- a/usr/src/sys/ufs/lfs/lfs_vnops.c
+++ b/usr/src/sys/ufs/lfs/lfs_vnops.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)lfs_vnops.c 7.89 (Berkeley) %G%
+ *     @(#)lfs_vnops.c 7.90 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -375,9 +375,6 @@ lfs_fsync(ap)
 {
        struct timeval tv;
 
 {
        struct timeval tv;
 

-#ifdef VERBOSE
-       printf("lfs_fsync\n");
-#endif

        tv = time;
        return (VOP_UPDATE(ap->a_vp, &tv, &tv,
            ap->a_waitfor == MNT_WAIT ? LFS_SYNC : 0));
        tv = time;
        return (VOP_UPDATE(ap->a_vp, &tv, &tv,
            ap->a_waitfor == MNT_WAIT ? LFS_SYNC : 0));


@@ -399,9 +396,6 @@ lfs_inactive(ap)
        struct timeval tv;
        int mode, error;
 
        struct timeval tv;
        int mode, error;
 

-#ifdef VERBOSE
-       printf("lfs_inactive\n");
-#endif

        if (prtactive && vp->v_usecount != 0)
                vprint("lfs_inactive: pushing active", vp);
 
        if (prtactive && vp->v_usecount != 0)
                vprint("lfs_inactive: pushing active", vp);