diff options
| author | christos <christos@NetBSD.org> | 1996-10-13 02:21:25 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 1996-10-13 02:21:25 +0000 |
| commit | 92a808f16759d144fda49d58d214aebcdeb0b1bd (patch) | |
| tree | 2a9cba4489715ff5cc454e766cfce6a198f90b9e /sys/miscfs/nullfs | |
| parent | a1dcf4b0261cafe6c3e7990470769e959df1de56 (diff) | |
backout previous kprintf changes
Diffstat (limited to 'sys/miscfs/nullfs')
| -rw-r--r-- | sys/miscfs/nullfs/null_subr.c | 24 | ||||
| -rw-r--r-- | sys/miscfs/nullfs/null_vfsops.c | 10 | ||||
| -rw-r--r-- | sys/miscfs/nullfs/null_vnops.c | 14 |
3 files changed, 24 insertions, 24 deletions
diff --git a/sys/miscfs/nullfs/null_subr.c b/sys/miscfs/nullfs/null_subr.c index 7e5c1000539..9fc4feaca53 100644 --- a/sys/miscfs/nullfs/null_subr.c +++ b/sys/miscfs/nullfs/null_subr.c @@ -1,4 +1,4 @@ -/* $NetBSD: null_subr.c,v 1.7 1996/10/10 22:54:09 christos Exp $ */ +/* $NetBSD: null_subr.c,v 1.8 1996/10/13 02:21:33 christos Exp $ */ /* * Copyright (c) 1992, 1993 @@ -79,7 +79,7 @@ nullfs_init() { #ifdef NULLFS_DIAGNOSTIC - kprintf("nullfs_init\n"); /* printed during system boot */ + printf("nullfs_init\n"); /* printed during system boot */ #endif null_node_hashtbl = hashinit(NNULLNODECACHE, M_CACHE, &null_node_hash); } @@ -113,7 +113,7 @@ loop: * the lower node. */ if (vget(vp, 0)) { - kprintf ("null_node_find: vget failed.\n"); + printf ("null_node_find: vget failed.\n"); goto loop; }; return (vp); @@ -265,7 +265,7 @@ null_node_create(mp, lowervp, newvpp, takelock) * Get new vnode. */ #ifdef NULLFS_DIAGNOSTIC - kprintf("null_node_create: create new alias vnode\n"); + printf("null_node_create: create new alias vnode\n"); #endif /* @@ -317,7 +317,7 @@ null_checkvp(vp, fil, lno) * with a funny vop vector. */ if (vp->v_op != null_vnodeop_p) { - kprintf ("null_checkvp: on non-null-node\n"); + printf ("null_checkvp: on non-null-node\n"); while (null_checkvp_barrier) /*WAIT*/ ; panic("null_checkvp"); }; @@ -325,26 +325,26 @@ null_checkvp(vp, fil, lno) if (a->null_lowervp == NULL) { /* Should never happen */ int i; u_long *p; - kprintf("vp = %x, ZERO ptr\n", vp); + printf("vp = %x, ZERO ptr\n", vp); for (p = (u_long *) a, i = 0; i < 8; i++) - kprintf(" %x", p[i]); - kprintf("\n"); + printf(" %x", p[i]); + printf("\n"); /* wait for debugger */ while (null_checkvp_barrier) /*WAIT*/ ; panic("null_checkvp"); } if (a->null_lowervp->v_usecount < 1) { int i; u_long *p; - kprintf("vp = %x, unref'ed lowervp\n", vp); + printf("vp = %x, unref'ed lowervp\n", vp); for (p = (u_long *) a, i = 0; i < 8; i++) - kprintf(" %x", p[i]); - kprintf("\n"); + printf(" %x", p[i]); + printf("\n"); /* wait for debugger */ while (null_checkvp_barrier) /*WAIT*/ ; panic ("null with unref'ed lowervp"); }; #ifdef notyet - kprintf("null %x/%d -> %x/%d [%s, %d]\n", + printf("null %x/%d -> %x/%d [%s, %d]\n", NULLTOV(a), NULLTOV(a)->v_usecount, a->null_lowervp, a->null_lowervp->v_usecount, fil, lno); diff --git a/sys/miscfs/nullfs/null_vfsops.c b/sys/miscfs/nullfs/null_vfsops.c index e2b396b47c4..619aba7adb9 100644 --- a/sys/miscfs/nullfs/null_vfsops.c +++ b/sys/miscfs/nullfs/null_vfsops.c @@ -1,4 +1,4 @@ -/* $NetBSD: null_vfsops.c,v 1.12 1996/10/10 22:54:10 christos Exp $ */ +/* $NetBSD: null_vfsops.c,v 1.13 1996/10/13 02:21:34 christos Exp $ */ /* * Copyright (c) 1992, 1993 @@ -87,7 +87,7 @@ nullfs_mount(mp, path, data, ndp, p) size_t size; #ifdef NULLFS_DIAGNOSTIC - kprintf("nullfs_mount(mp = %x)\n", mp); + printf("nullfs_mount(mp = %x)\n", mp); #endif /* @@ -165,7 +165,7 @@ nullfs_mount(mp, path, data, ndp, p) &size); bzero(mp->mnt_stat.f_mntfromname + size, MNAMELEN - size); #ifdef NULLFS_DIAGNOSTIC - kprintf("nullfs_mount: lower %s, alias at %s\n", + printf("nullfs_mount: lower %s, alias at %s\n", mp->mnt_stat.f_mntfromname, mp->mnt_stat.f_mntonname); #endif return (0); @@ -202,7 +202,7 @@ nullfs_unmount(mp, mntflags, p) extern int doforce; #ifdef NULLFS_DIAGNOSTIC - kprintf("nullfs_unmount(mp = %x)\n", mp); + printf("nullfs_unmount(mp = %x)\n", mp); #endif if (mntflags & MNT_FORCE) { @@ -291,7 +291,7 @@ nullfs_statfs(mp, sbp, p) struct statfs mstat; #ifdef NULLFS_DIAGNOSTIC - kprintf("nullfs_statfs(mp = %x, vp = %x->%x)\n", mp, + printf("nullfs_statfs(mp = %x, vp = %x->%x)\n", mp, MOUNTTONULLMOUNT(mp)->nullm_rootvp, NULLVPTOLOWERVP(MOUNTTONULLMOUNT(mp)->nullm_rootvp)); #endif diff --git a/sys/miscfs/nullfs/null_vnops.c b/sys/miscfs/nullfs/null_vnops.c index c9e37b6aa22..65a4c630374 100644 --- a/sys/miscfs/nullfs/null_vnops.c +++ b/sys/miscfs/nullfs/null_vnops.c @@ -1,4 +1,4 @@ -/* $NetBSD: null_vnops.c,v 1.8 1996/10/10 22:54:11 christos Exp $ */ +/* $NetBSD: null_vnops.c,v 1.9 1996/10/13 02:21:35 christos Exp $ */ /* * Copyright (c) 1992, 1993 @@ -235,7 +235,7 @@ null_bypass(v) int reles, i; if (null_bug_bypass) - kprintf ("null_bypass: %s\n", descp->vdesc_name); + printf ("null_bypass: %s\n", descp->vdesc_name); #ifdef SAFETY /* @@ -424,14 +424,14 @@ null_print(v) register struct vnode *vp = ap->a_vp; register struct null_node *nn = VTONULL(vp); - kprintf ("\ttag VT_NULLFS, vp=%p, lowervp=%p\n", vp, NULLVPTOLOWERVP(vp)); + printf ("\ttag VT_NULLFS, vp=%p, lowervp=%p\n", vp, NULLVPTOLOWERVP(vp)); #ifdef DIAGNOSTIC - kprintf("%s%s owner pid %d retpc %p retret %p\n", + printf("%s%s owner pid %d retpc %p retret %p\n", (nn->null_flags & NULL_LOCKED) ? "(LOCKED) " : "", (nn->null_flags & NULL_LLOCK) ? "(LLOCK) " : "", nn->null_pid, nn->null_lockpc, nn->null_lockpc2); #else - kprintf("%s%s\n", + printf("%s%s\n", (nn->null_flags & NULL_LOCKED) ? "(LOCKED) " : "", (nn->null_flags & NULL_LLOCK) ? "(LLOCK) " : ""); #endif @@ -512,7 +512,7 @@ null_lock(v) #ifdef NULLFS_DIAGNOSTIC vprint("null_lock_e", ap->a_vp); - kprintf("retpc=%lx, retretpc=%lx\n", RETURN_PC(0), RETURN_PC(1)); + printf("retpc=%lx, retretpc=%lx\n", RETURN_PC(0), RETURN_PC(1)); #endif start: while (vp->v_flag & VXLOCK) { @@ -622,7 +622,7 @@ null_lookup(v) int flags = ap->a_cnp->cn_flags; #ifdef NULLFS_DIAGNOSTIC - kprintf("null_lookup: dvp=%lx, name='%s'\n", + printf("null_lookup: dvp=%lx, name='%s'\n", ap->a_dvp, ap->a_cnp->cn_nameptr); #endif /* |
