backout previous kprintf changes
This commit is contained in:
christos
parent
a1dcf4b026
commit
92a808f167
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: getfile.c,v 1.4 1996/10/10 22:46:23 christos Exp $ */
|
||||
/* $NetBSD: getfile.c,v 1.5 1996/10/13 02:27:30 christos Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1993
|
||||
|
|
@ -36,6 +36,8 @@
|
|||
*/
|
||||
#include "stand.h"
|
||||
|
||||
#define CTRL(x) (a&037)
|
||||
|
||||
int
|
||||
getfile(prompt, mode)
|
||||
char *prompt;
|
||||
|
|
@ -45,8 +47,10 @@ getfile(prompt, mode)
|
|||
char buf[100];
|
||||
|
||||
do {
|
||||
kprintf("%s: ", prompt);
|
||||
printf("%s: ", prompt);
|
||||
gets(buf);
|
||||
if (buf[0] == CTRL('d') && buf[1] == 0)
|
||||
return (-1);
|
||||
} while ((fd = open(buf, mode)) < 0);
|
||||
|
||||
return (fd);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: dead_vnops.c,v 1.20 1996/10/10 22:54:00 christos Exp $ */
|
||||
/* $NetBSD: dead_vnops.c,v 1.21 1996/10/13 02:21:25 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1989, 1993
|
||||
|
|
@ -318,7 +318,7 @@ int
|
|||
dead_print(v)
|
||||
void *v;
|
||||
{
|
||||
kprintf("tag VT_NON, dead vnode\n");
|
||||
printf("tag VT_NON, dead vnode\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: fdesc_vnops.c,v 1.36 1996/10/10 22:54:02 christos Exp $ */
|
||||
/* $NetBSD: fdesc_vnops.c,v 1.37 1996/10/13 02:21:27 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1992, 1993
|
||||
|
|
@ -729,7 +729,7 @@ fdesc_readdir(v)
|
|||
if (fdp->fd_ofiles[i - 2] == NULL)
|
||||
continue;
|
||||
d.d_fileno = i - 2 + FD_STDIN;
|
||||
d.d_namlen = ksprintf(d.d_name, "%d", i - 2);
|
||||
d.d_namlen = sprintf(d.d_name, "%d", i - 2);
|
||||
d.d_type = DT_UNKNOWN;
|
||||
break;
|
||||
}
|
||||
|
|
@ -952,7 +952,7 @@ int
|
|||
fdesc_print(v)
|
||||
void *v;
|
||||
{
|
||||
kprintf("tag VT_NON, fdesc vnode\n");
|
||||
printf("tag VT_NON, fdesc vnode\n");
|
||||
return (0);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: fifo_vnops.c,v 1.21 1996/10/10 22:54:04 christos Exp $ */
|
||||
/* $NetBSD: fifo_vnops.c,v 1.22 1996/10/13 02:21:29 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1990, 1993
|
||||
|
|
@ -454,9 +454,9 @@ fifo_print(v)
|
|||
struct vnode *a_vp;
|
||||
} */ *ap = v;
|
||||
|
||||
kprintf("tag VT_NON");
|
||||
printf("tag VT_NON");
|
||||
fifo_printinfo(ap->a_vp);
|
||||
kprintf("\n");
|
||||
printf("\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -469,7 +469,7 @@ fifo_printinfo(vp)
|
|||
{
|
||||
register struct fifoinfo *fip = vp->v_fifoinfo;
|
||||
|
||||
kprintf(", fifo with %ld readers and %ld writers",
|
||||
printf(", fifo with %ld readers and %ld writers",
|
||||
fip->fi_readers, fip->fi_writers);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: kernfs_vfsops.c,v 1.27 1996/10/10 22:54:06 christos Exp $ */
|
||||
/* $NetBSD: kernfs_vfsops.c,v 1.28 1996/10/13 02:21:30 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1992, 1993
|
||||
|
|
@ -99,7 +99,7 @@ kernfs_get_rrootdev()
|
|||
return;
|
||||
}
|
||||
rrootdev = NODEV;
|
||||
kprintf("kernfs_get_rrootdev: no raw root device\n");
|
||||
printf("kernfs_get_rrootdev: no raw root device\n");
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -119,7 +119,7 @@ kernfs_mount(mp, path, data, ndp, p)
|
|||
struct vnode *rvp;
|
||||
|
||||
#ifdef KERNFS_DIAGNOSTIC
|
||||
kprintf("kernfs_mount(mp = %x)\n", mp);
|
||||
printf("kernfs_mount(mp = %x)\n", mp);
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
|
@ -137,7 +137,7 @@ kernfs_mount(mp, path, data, ndp, p)
|
|||
rvp->v_type = VDIR;
|
||||
rvp->v_flag |= VROOT;
|
||||
#ifdef KERNFS_DIAGNOSTIC
|
||||
kprintf("kernfs_mount: root vp = %x\n", rvp);
|
||||
printf("kernfs_mount: root vp = %x\n", rvp);
|
||||
#endif
|
||||
fmp->kf_root = rvp;
|
||||
mp->mnt_flag |= MNT_LOCAL;
|
||||
|
|
@ -149,7 +149,7 @@ kernfs_mount(mp, path, data, ndp, p)
|
|||
bzero(mp->mnt_stat.f_mntfromname, MNAMELEN);
|
||||
bcopy("kernfs", mp->mnt_stat.f_mntfromname, sizeof("kernfs"));
|
||||
#ifdef KERNFS_DIAGNOSTIC
|
||||
kprintf("kernfs_mount: at %s\n", mp->mnt_stat.f_mntonname);
|
||||
printf("kernfs_mount: at %s\n", mp->mnt_stat.f_mntonname);
|
||||
#endif
|
||||
|
||||
kernfs_get_rrootdev();
|
||||
|
|
@ -178,7 +178,7 @@ kernfs_unmount(mp, mntflags, p)
|
|||
struct vnode *rootvp = VFSTOKERNFS(mp)->kf_root;
|
||||
|
||||
#ifdef KERNFS_DIAGNOSTIC
|
||||
kprintf("kernfs_unmount(mp = %x)\n", mp);
|
||||
printf("kernfs_unmount(mp = %x)\n", mp);
|
||||
#endif
|
||||
|
||||
if (mntflags & MNT_FORCE) {
|
||||
|
|
@ -196,7 +196,7 @@ kernfs_unmount(mp, mntflags, p)
|
|||
if (rootvp->v_usecount > 1)
|
||||
return (EBUSY);
|
||||
#ifdef KERNFS_DIAGNOSTIC
|
||||
kprintf("kernfs_unmount: calling vflush\n");
|
||||
printf("kernfs_unmount: calling vflush\n");
|
||||
#endif
|
||||
if ((error = vflush(mp, rootvp, flags)) != 0)
|
||||
return (error);
|
||||
|
|
@ -225,7 +225,7 @@ kernfs_root(mp, vpp)
|
|||
struct vnode *vp;
|
||||
|
||||
#ifdef KERNFS_DIAGNOSTIC
|
||||
kprintf("kernfs_root(mp = %x)\n", mp);
|
||||
printf("kernfs_root(mp = %x)\n", mp);
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
|
@ -258,7 +258,7 @@ kernfs_statfs(mp, sbp, p)
|
|||
{
|
||||
|
||||
#ifdef KERNFS_DIAGNOSTIC
|
||||
kprintf("kernfs_statfs(mp = %x)\n", mp);
|
||||
printf("kernfs_statfs(mp = %x)\n", mp);
|
||||
#endif
|
||||
|
||||
#ifdef COMPAT_09
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: kernfs_vnops.c,v 1.46 1996/10/10 22:54:08 christos Exp $ */
|
||||
/* $NetBSD: kernfs_vnops.c,v 1.47 1996/10/13 02:21:31 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1992, 1993
|
||||
|
|
@ -215,14 +215,14 @@ kernfs_xread(kt, off, bufp, len)
|
|||
struct timeval tv;
|
||||
|
||||
microtime(&tv);
|
||||
ksprintf(*bufp, "%ld %ld\n", tv.tv_sec, tv.tv_usec);
|
||||
sprintf(*bufp, "%ld %ld\n", tv.tv_sec, tv.tv_usec);
|
||||
break;
|
||||
}
|
||||
|
||||
case KTT_INT: {
|
||||
int *ip = kt->kt_data;
|
||||
|
||||
ksprintf(*bufp, "%d\n", *ip);
|
||||
sprintf(*bufp, "%d\n", *ip);
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
@ -262,7 +262,7 @@ kernfs_xread(kt, off, bufp, len)
|
|||
|
||||
case KTT_AVENRUN:
|
||||
averunnable.fscale = FSCALE;
|
||||
ksprintf(*bufp, "%d %d %d %ld\n",
|
||||
sprintf(*bufp, "%d %d %d %ld\n",
|
||||
averunnable.ldavg[0], averunnable.ldavg[1],
|
||||
averunnable.ldavg[2], averunnable.fscale);
|
||||
break;
|
||||
|
|
@ -322,9 +322,9 @@ kernfs_lookup(v)
|
|||
int error, i;
|
||||
|
||||
#ifdef KERNFS_DIAGNOSTIC
|
||||
kprintf("kernfs_lookup(%x)\n", ap);
|
||||
kprintf("kernfs_lookup(dp = %x, vpp = %x, cnp = %x)\n", dvp, vpp, ap->a_cnp);
|
||||
kprintf("kernfs_lookup(%s)\n", pname);
|
||||
printf("kernfs_lookup(%x)\n", ap);
|
||||
printf("kernfs_lookup(dp = %x, vpp = %x, cnp = %x)\n", dvp, vpp, ap->a_cnp);
|
||||
printf("kernfs_lookup(%s)\n", pname);
|
||||
#endif
|
||||
|
||||
*vpp = NULLVP;
|
||||
|
|
@ -355,7 +355,7 @@ kernfs_lookup(v)
|
|||
}
|
||||
|
||||
#ifdef KERNFS_DIAGNOSTIC
|
||||
kprintf("kernfs_lookup: i = %d, failed", i);
|
||||
printf("kernfs_lookup: i = %d, failed", i);
|
||||
#endif
|
||||
|
||||
return (cnp->cn_nameiop == LOOKUP ? ENOENT : EROFS);
|
||||
|
|
@ -373,7 +373,7 @@ found:
|
|||
}
|
||||
|
||||
#ifdef KERNFS_DIAGNOSTIC
|
||||
kprintf("kernfs_lookup: allocate new vnode\n");
|
||||
printf("kernfs_lookup: allocate new vnode\n");
|
||||
#endif
|
||||
error = getnewvnode(VT_KERNFS, dvp->v_mount, kernfs_vnodeop_p, &fvp);
|
||||
if (error)
|
||||
|
|
@ -386,7 +386,7 @@ found:
|
|||
*vpp = fvp;
|
||||
|
||||
#ifdef KERNFS_DIAGNOSTIC
|
||||
kprintf("kernfs_lookup: newvp = %x\n", fvp);
|
||||
printf("kernfs_lookup: newvp = %x\n", fvp);
|
||||
#endif
|
||||
return (0);
|
||||
}
|
||||
|
|
@ -442,7 +442,7 @@ kernfs_getattr(v)
|
|||
|
||||
if (vp->v_flag & VROOT) {
|
||||
#ifdef KERNFS_DIAGNOSTIC
|
||||
kprintf("kernfs_getattr: stat rootdir\n");
|
||||
printf("kernfs_getattr: stat rootdir\n");
|
||||
#endif
|
||||
vap->va_type = VDIR;
|
||||
vap->va_mode = DIR_MODE;
|
||||
|
|
@ -453,7 +453,7 @@ kernfs_getattr(v)
|
|||
struct kern_target *kt = VTOKERN(vp)->kf_kt;
|
||||
int nbytes, total;
|
||||
#ifdef KERNFS_DIAGNOSTIC
|
||||
kprintf("kernfs_getattr: stat target %s\n", kt->kt_name);
|
||||
printf("kernfs_getattr: stat target %s\n", kt->kt_name);
|
||||
#endif
|
||||
vap->va_type = kt->kt_vtype;
|
||||
vap->va_mode = kt->kt_mode;
|
||||
|
|
@ -467,7 +467,7 @@ kernfs_getattr(v)
|
|||
}
|
||||
|
||||
#ifdef KERNFS_DIAGNOSTIC
|
||||
kprintf("kernfs_getattr: return error %d\n", error);
|
||||
printf("kernfs_getattr: return error %d\n", error);
|
||||
#endif
|
||||
return (error);
|
||||
}
|
||||
|
|
@ -509,7 +509,7 @@ kernfs_read(v)
|
|||
kt = VTOKERN(vp)->kf_kt;
|
||||
|
||||
#ifdef KERNFS_DIAGNOSTIC
|
||||
kprintf("kern_read %s\n", kt->kt_name);
|
||||
printf("kern_read %s\n", kt->kt_name);
|
||||
#endif
|
||||
|
||||
off = uio->uio_offset;
|
||||
|
|
@ -598,7 +598,7 @@ kernfs_readdir(v)
|
|||
for (kt = &kern_targets[i];
|
||||
uio->uio_resid >= UIO_MX && i < nkern_targets; kt++, i++) {
|
||||
#ifdef KERNFS_DIAGNOSTIC
|
||||
kprintf("kernfs_readdir: i = %d\n", i);
|
||||
printf("kernfs_readdir: i = %d\n", i);
|
||||
#endif
|
||||
|
||||
if (kt->kt_tag == KTT_DEVICE) {
|
||||
|
|
@ -634,7 +634,7 @@ kernfs_inactive(v)
|
|||
struct vnode *vp = ap->a_vp;
|
||||
|
||||
#ifdef KERNFS_DIAGNOSTIC
|
||||
kprintf("kernfs_inactive(%x)\n", vp);
|
||||
printf("kernfs_inactive(%x)\n", vp);
|
||||
#endif
|
||||
/*
|
||||
* Clear out the v_type field to avoid
|
||||
|
|
@ -654,7 +654,7 @@ kernfs_reclaim(v)
|
|||
struct vnode *vp = ap->a_vp;
|
||||
|
||||
#ifdef KERNFS_DIAGNOSTIC
|
||||
kprintf("kernfs_reclaim(%x)\n", vp);
|
||||
printf("kernfs_reclaim(%x)\n", vp);
|
||||
#endif
|
||||
if (vp->v_data) {
|
||||
FREE(vp->v_data, M_TEMP);
|
||||
|
|
@ -710,7 +710,7 @@ kernfs_print(v)
|
|||
void *v;
|
||||
{
|
||||
|
||||
kprintf("tag VT_KERNFS, kernfs vnode\n");
|
||||
printf("tag VT_KERNFS, kernfs vnode\n");
|
||||
return (0);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: portal_vnops.c,v 1.22 1996/10/10 22:54:13 christos Exp $ */
|
||||
/* $NetBSD: portal_vnops.c,v 1.23 1996/10/13 02:21:36 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1992, 1993
|
||||
|
|
@ -178,7 +178,7 @@ portal_closefd(p, fd)
|
|||
* we could do if we got one, so just print a message.
|
||||
*/
|
||||
if (error)
|
||||
kprintf("portal_closefd: error = %d\n", error);
|
||||
printf("portal_closefd: error = %d\n", error);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -474,7 +474,7 @@ portal_open(v)
|
|||
* Close extra fds.
|
||||
*/
|
||||
int i;
|
||||
kprintf("portal_open: %d extra fds\n", newfds - 1);
|
||||
printf("portal_open: %d extra fds\n", newfds - 1);
|
||||
for (i = 1; i < newfds; i++) {
|
||||
portal_closefd(p, *ip);
|
||||
ip++;
|
||||
|
|
@ -671,7 +671,7 @@ int
|
|||
portal_print(v)
|
||||
void *v;
|
||||
{
|
||||
kprintf("tag VT_PORTAL, portal vnode\n");
|
||||
printf("tag VT_PORTAL, portal vnode\n");
|
||||
return (0);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: procfs_mem.c,v 1.10 1996/10/10 22:54:14 christos Exp $ */
|
||||
/* $NetBSD: procfs_mem.c,v 1.11 1996/10/13 02:21:38 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1993 Jan-Simon Pendry
|
||||
|
|
@ -277,9 +277,9 @@ procfs_findtextvp(p)
|
|||
if (!error) {
|
||||
vm_pager_t pager;
|
||||
|
||||
kprintf("procfs: found vm object\n");
|
||||
printf("procfs: found vm object\n");
|
||||
vm_map_lookup_done(map, out_entry);
|
||||
kprintf("procfs: vm object = %x\n", object);
|
||||
printf("procfs: vm object = %x\n", object);
|
||||
|
||||
/*
|
||||
* At this point, assuming no errors, object
|
||||
|
|
@ -289,21 +289,21 @@ procfs_findtextvp(p)
|
|||
*/
|
||||
|
||||
pager = object->pager;
|
||||
kprintf("procfs: pager = %x\n", pager);
|
||||
printf("procfs: pager = %x\n", pager);
|
||||
if (pager)
|
||||
kprintf("procfs: found pager, type = %d\n",
|
||||
printf("procfs: found pager, type = %d\n",
|
||||
pager->pg_type);
|
||||
if (pager && pager->pg_type == PG_VNODE) {
|
||||
struct vnode *vp;
|
||||
|
||||
vp = (struct vnode *) pager->pg_handle;
|
||||
kprintf("procfs: vp = 0x%x\n", vp);
|
||||
printf("procfs: vp = 0x%x\n", vp);
|
||||
return (vp);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
kprintf("procfs: text object not found\n");
|
||||
printf("procfs: text object not found\n");
|
||||
return (0);
|
||||
}
|
||||
#endif /* probably_never */
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: procfs_status.c,v 1.12 1996/10/10 22:54:15 christos Exp $ */
|
||||
/* $NetBSD: procfs_status.c,v 1.13 1996/10/13 02:21:38 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1993 Jan-Simon Pendry
|
||||
|
|
@ -84,54 +84,54 @@ procfs_dostatus(curp, p, pfs, uio)
|
|||
bcopy(p->p_comm, ps, MAXCOMLEN);
|
||||
ps[MAXCOMLEN] = '\0';
|
||||
ps += strlen(ps);
|
||||
ps += ksprintf(ps, " %d %d %d %d ", pid, ppid, pgid, sid);
|
||||
ps += sprintf(ps, " %d %d %d %d ", pid, ppid, pgid, sid);
|
||||
|
||||
if ((p->p_flag&P_CONTROLT) && (tp = sess->s_ttyp))
|
||||
ps += ksprintf(ps, "%d,%d ", major(tp->t_dev),
|
||||
ps += sprintf(ps, "%d,%d ", major(tp->t_dev),
|
||||
minor(tp->t_dev));
|
||||
else
|
||||
ps += ksprintf(ps, "%d,%d ", -1, -1);
|
||||
ps += sprintf(ps, "%d,%d ", -1, -1);
|
||||
|
||||
sep = "";
|
||||
if (sess->s_ttyvp) {
|
||||
ps += ksprintf(ps, "%sctty", sep);
|
||||
ps += sprintf(ps, "%sctty", sep);
|
||||
sep = ",";
|
||||
}
|
||||
if (SESS_LEADER(p)) {
|
||||
ps += ksprintf(ps, "%ssldr", sep);
|
||||
ps += sprintf(ps, "%ssldr", sep);
|
||||
sep = ",";
|
||||
}
|
||||
if (*sep != ',')
|
||||
ps += ksprintf(ps, "noflags");
|
||||
ps += sprintf(ps, "noflags");
|
||||
|
||||
if (p->p_flag & P_INMEM)
|
||||
ps += ksprintf(ps, " %ld,%ld",
|
||||
ps += sprintf(ps, " %ld,%ld",
|
||||
p->p_stats->p_start.tv_sec,
|
||||
p->p_stats->p_start.tv_usec);
|
||||
else
|
||||
ps += ksprintf(ps, " -1,-1");
|
||||
ps += sprintf(ps, " -1,-1");
|
||||
|
||||
{
|
||||
struct timeval ut, st;
|
||||
|
||||
calcru(p, &ut, &st, (void *) 0);
|
||||
ps += ksprintf(ps, " %ld,%ld %ld,%ld",
|
||||
ps += sprintf(ps, " %ld,%ld %ld,%ld",
|
||||
ut.tv_sec,
|
||||
ut.tv_usec,
|
||||
st.tv_sec,
|
||||
st.tv_usec);
|
||||
}
|
||||
|
||||
ps += ksprintf(ps, " %s",
|
||||
ps += sprintf(ps, " %s",
|
||||
(p->p_wchan && p->p_wmesg) ? p->p_wmesg : "nochan");
|
||||
|
||||
cr = p->p_ucred;
|
||||
|
||||
ps += ksprintf(ps, " %d", cr->cr_uid);
|
||||
ps += ksprintf(ps, " %d", cr->cr_gid);
|
||||
ps += sprintf(ps, " %d", cr->cr_uid);
|
||||
ps += sprintf(ps, " %d", cr->cr_gid);
|
||||
for (i = 0; i < cr->cr_ngroups; i++)
|
||||
ps += ksprintf(ps, ",%d", cr->cr_groups[i]);
|
||||
ps += ksprintf(ps, "\n");
|
||||
ps += sprintf(ps, ",%d", cr->cr_groups[i]);
|
||||
ps += sprintf(ps, "\n");
|
||||
|
||||
xlen = ps - psbuf;
|
||||
xlen -= uio->uio_offset;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: procfs_vnops.c,v 1.43 1996/10/10 22:54:17 christos Exp $ */
|
||||
/* $NetBSD: procfs_vnops.c,v 1.44 1996/10/13 02:21:39 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1993 Jan-Simon Pendry
|
||||
|
|
@ -401,7 +401,7 @@ procfs_print(v)
|
|||
} */ *ap = v;
|
||||
struct pfsnode *pfs = VTOPFS(ap->a_vp);
|
||||
|
||||
kprintf("tag VT_PROCFS, type %d, pid %d, mode %x, flags %lx\n",
|
||||
printf("tag VT_PROCFS, type %d, pid %d, mode %x, flags %lx\n",
|
||||
pfs->pfs_type, pfs->pfs_pid, pfs->pfs_mode, pfs->pfs_flags);
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -556,7 +556,7 @@ procfs_getattr(v)
|
|||
vap->va_uid = 0;
|
||||
vap->va_gid = 0;
|
||||
vap->va_size = vap->va_bytes =
|
||||
ksprintf(buf, "%ld", (long)curproc->p_pid);
|
||||
sprintf(buf, "%ld", (long)curproc->p_pid);
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
@ -877,7 +877,7 @@ procfs_readdir(v)
|
|||
goto done;
|
||||
}
|
||||
d.d_fileno = PROCFS_FILENO(p->p_pid, Pproc);
|
||||
d.d_namlen = ksprintf(d.d_name, "%ld",
|
||||
d.d_namlen = sprintf(d.d_name, "%ld",
|
||||
(long)p->p_pid);
|
||||
d.d_type = DT_REG;
|
||||
p = p->p_list.le_next;
|
||||
|
|
@ -926,7 +926,7 @@ procfs_readlink(v)
|
|||
if (VTOPFS(ap->a_vp)->pfs_fileno != PROCFS_FILENO(0, Pcurproc))
|
||||
return (EINVAL);
|
||||
|
||||
len = ksprintf(buf, "%ld", (long)curproc->p_pid);
|
||||
len = sprintf(buf, "%ld", (long)curproc->p_pid);
|
||||
|
||||
return (uiomove((caddr_t)buf, len, ap->a_uio));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: spec_vnops.c,v 1.33 1996/10/10 22:54:19 christos Exp $ */
|
||||
/* $NetBSD: spec_vnops.c,v 1.34 1996/10/13 02:21:41 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1989, 1993
|
||||
|
|
@ -620,7 +620,7 @@ spec_print(v)
|
|||
struct vnode *a_vp;
|
||||
} */ *ap = v;
|
||||
|
||||
kprintf("tag VT_NON, dev %d, %d\n", major(ap->a_vp->v_rdev),
|
||||
printf("tag VT_NON, dev %d, %d\n", major(ap->a_vp->v_rdev),
|
||||
minor(ap->a_vp->v_rdev));
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: umap_subr.c,v 1.9 1996/10/10 22:54:20 christos Exp $ */
|
||||
/* $NetBSD: umap_subr.c,v 1.10 1996/10/13 02:21:42 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1992, 1993
|
||||
|
|
@ -79,7 +79,7 @@ umapfs_init()
|
|||
{
|
||||
|
||||
#ifdef UMAPFS_DIAGNOSTIC
|
||||
kprintf("umapfs_init\n"); /* printed during system boot */
|
||||
printf("umapfs_init\n"); /* printed during system boot */
|
||||
#endif
|
||||
umap_node_hashtbl = hashinit(NUMAPNODECACHE, M_CACHE, &umap_node_hash);
|
||||
}
|
||||
|
|
@ -145,7 +145,7 @@ umap_node_find(mp, targetvp)
|
|||
struct vnode *vp;
|
||||
|
||||
#ifdef UMAPFS_DIAGNOSTIC
|
||||
kprintf("umap_node_find(mp = %x, target = %x)\n", mp, targetvp);
|
||||
printf("umap_node_find(mp = %x, target = %x)\n", mp, targetvp);
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
|
@ -167,7 +167,7 @@ loop:
|
|||
*/
|
||||
if (vget(vp, 0)) {
|
||||
#ifdef UMAPFS_DIAGNOSTIC
|
||||
kprintf ("umap_node_find: vget failed.\n");
|
||||
printf ("umap_node_find: vget failed.\n");
|
||||
#endif
|
||||
goto loop;
|
||||
}
|
||||
|
|
@ -176,7 +176,7 @@ loop:
|
|||
}
|
||||
|
||||
#ifdef UMAPFS_DIAGNOSTIC
|
||||
kprintf("umap_node_find(%x, %x): NOT found\n", mp, targetvp);
|
||||
printf("umap_node_find(%x, %x): NOT found\n", mp, targetvp);
|
||||
#endif
|
||||
|
||||
return (0);
|
||||
|
|
@ -313,7 +313,7 @@ umap_node_create(mp, targetvp, newvpp)
|
|||
* Get new vnode.
|
||||
*/
|
||||
#ifdef UMAPFS_DIAGNOSTIC
|
||||
kprintf("umap_node_create: create new alias vnode\n");
|
||||
printf("umap_node_create: create new alias vnode\n");
|
||||
#endif
|
||||
/*
|
||||
* Make new vnode reference the umap_node.
|
||||
|
|
@ -352,7 +352,7 @@ umap_checkvp(vp, fil, lno)
|
|||
* with funny vop vector.
|
||||
*/
|
||||
if (vp->v_op != umap_vnodeop_p) {
|
||||
kprintf("umap_checkvp: on non-umap-node\n");
|
||||
printf("umap_checkvp: on non-umap-node\n");
|
||||
while (umap_checkvp_barrier) /*WAIT*/ ;
|
||||
panic("umap_checkvp");
|
||||
}
|
||||
|
|
@ -360,26 +360,26 @@ umap_checkvp(vp, fil, lno)
|
|||
if (a->umap_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++)
|
||||
printf(" %x", p[i]);
|
||||
kprintf("\n");
|
||||
printf("\n");
|
||||
/* wait for debugger */
|
||||
while (umap_checkvp_barrier) /*WAIT*/ ;
|
||||
panic("umap_checkvp");
|
||||
}
|
||||
if (a->umap_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 (umap_checkvp_barrier) /*WAIT*/ ;
|
||||
panic ("umap with unref'ed lowervp");
|
||||
}
|
||||
#if 0
|
||||
kprintf("umap %x/%d -> %x/%d [%s, %d]\n",
|
||||
printf("umap %x/%d -> %x/%d [%s, %d]\n",
|
||||
a->umap_vnode, a->umap_vnode->v_usecount,
|
||||
a->umap_lowervp, a->umap_lowervp->v_usecount,
|
||||
fil, lno);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: umap_vfsops.c,v 1.10 1996/10/10 22:54:21 christos Exp $ */
|
||||
/* $NetBSD: umap_vfsops.c,v 1.11 1996/10/13 02:21:43 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1992, 1993
|
||||
|
|
@ -87,7 +87,7 @@ umapfs_mount(mp, path, data, ndp, p)
|
|||
int error;
|
||||
|
||||
#ifdef UMAPFS_DIAGNOSTIC
|
||||
kprintf("umapfs_mount(mp = %x)\n", mp);
|
||||
printf("umapfs_mount(mp = %x)\n", mp);
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
|
@ -118,7 +118,7 @@ umapfs_mount(mp, path, data, ndp, p)
|
|||
*/
|
||||
lowerrootvp = ndp->ni_vp;
|
||||
#ifdef UMAPFS_DIAGNOSTIC
|
||||
kprintf("vp = %x, check for VDIR...\n", lowerrootvp);
|
||||
printf("vp = %x, check for VDIR...\n", lowerrootvp);
|
||||
#endif
|
||||
vrele(ndp->ni_dvp);
|
||||
ndp->ni_dvp = 0;
|
||||
|
|
@ -129,7 +129,7 @@ umapfs_mount(mp, path, data, ndp, p)
|
|||
}
|
||||
|
||||
#ifdef UMAPFS_DIAGNOSTIC
|
||||
kprintf("mp = %x\n", mp);
|
||||
printf("mp = %x\n", mp);
|
||||
#endif
|
||||
|
||||
amp = (struct umap_mount *) malloc(sizeof(struct umap_mount),
|
||||
|
|
@ -151,9 +151,9 @@ umapfs_mount(mp, path, data, ndp, p)
|
|||
return (error);
|
||||
|
||||
#ifdef UMAP_DIAGNOSTIC
|
||||
kprintf("umap_mount:nentries %d\n",args.nentries);
|
||||
printf("umap_mount:nentries %d\n",args.nentries);
|
||||
for (i = 0; i < args.nentries; i++)
|
||||
kprintf(" %d maps to %d\n", amp->info_mapdata[i][0],
|
||||
printf(" %d maps to %d\n", amp->info_mapdata[i][0],
|
||||
amp->info_mapdata[i][1]);
|
||||
#endif
|
||||
|
||||
|
|
@ -163,9 +163,9 @@ umapfs_mount(mp, path, data, ndp, p)
|
|||
return (error);
|
||||
|
||||
#ifdef UMAP_DIAGNOSTIC
|
||||
kprintf("umap_mount:gnentries %d\n",args.gnentries);
|
||||
printf("umap_mount:gnentries %d\n",args.gnentries);
|
||||
for (i = 0; i < args.gnentries; i++)
|
||||
kprintf("\tgroup %d maps to %d\n",
|
||||
printf("\tgroup %d maps to %d\n",
|
||||
amp->info_gmapdata[i][0],
|
||||
amp->info_gmapdata[i][1]);
|
||||
#endif
|
||||
|
|
@ -207,7 +207,7 @@ umapfs_mount(mp, path, data, ndp, p)
|
|||
&size);
|
||||
bzero(mp->mnt_stat.f_mntfromname + size, MNAMELEN - size);
|
||||
#ifdef UMAPFS_DIAGNOSTIC
|
||||
kprintf("umapfs_mount: lower %s, alias at %s\n",
|
||||
printf("umapfs_mount: lower %s, alias at %s\n",
|
||||
mp->mnt_stat.f_mntfromname, mp->mnt_stat.f_mntonname);
|
||||
#endif
|
||||
return (0);
|
||||
|
|
@ -244,7 +244,7 @@ umapfs_unmount(mp, mntflags, p)
|
|||
extern int doforce;
|
||||
|
||||
#ifdef UMAPFS_DIAGNOSTIC
|
||||
kprintf("umapfs_unmount(mp = %x)\n", mp);
|
||||
printf("umapfs_unmount(mp = %x)\n", mp);
|
||||
#endif
|
||||
|
||||
if (mntflags & MNT_FORCE) {
|
||||
|
|
@ -296,7 +296,7 @@ umapfs_root(mp, vpp)
|
|||
struct vnode *vp;
|
||||
|
||||
#ifdef UMAPFS_DIAGNOSTIC
|
||||
kprintf("umapfs_root(mp = %x, vp = %x->%x)\n", mp,
|
||||
printf("umapfs_root(mp = %x, vp = %x->%x)\n", mp,
|
||||
MOUNTTOUMAPMOUNT(mp)->umapm_rootvp,
|
||||
UMAPVPTOLOWERVP(MOUNTTOUMAPMOUNT(mp)->umapm_rootvp));
|
||||
#endif
|
||||
|
|
@ -333,7 +333,7 @@ umapfs_statfs(mp, sbp, p)
|
|||
struct statfs mstat;
|
||||
|
||||
#ifdef UMAPFS_DIAGNOSTIC
|
||||
kprintf("umapfs_statfs(mp = %x, vp = %x->%x)\n", mp,
|
||||
printf("umapfs_statfs(mp = %x, vp = %x->%x)\n", mp,
|
||||
MOUNTTOUMAPMOUNT(mp)->umapm_rootvp,
|
||||
UMAPVPTOLOWERVP(MOUNTTOUMAPMOUNT(mp)->umapm_rootvp));
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: umap_vnops.c,v 1.7 1996/10/10 22:54:22 christos Exp $ */
|
||||
/* $NetBSD: umap_vnops.c,v 1.8 1996/10/13 02:21:44 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1992, 1993
|
||||
|
|
@ -117,7 +117,7 @@ umap_bypass(v)
|
|||
struct componentname **compnamepp = 0;
|
||||
|
||||
if (umap_bug_bypass)
|
||||
kprintf("umap_bypass: %s\n", descp->vdesc_name);
|
||||
printf("umap_bypass: %s\n", descp->vdesc_name);
|
||||
|
||||
#ifdef SAFETY
|
||||
/*
|
||||
|
|
@ -178,7 +178,7 @@ umap_bypass(v)
|
|||
credp = *credpp;
|
||||
|
||||
if (umap_bug_bypass && credp->cr_uid != 0)
|
||||
kprintf("umap_bypass: user was %d, group %d\n",
|
||||
printf("umap_bypass: user was %d, group %d\n",
|
||||
credp->cr_uid, credp->cr_gid);
|
||||
|
||||
/* Map all ids in the credential structure. */
|
||||
|
|
@ -186,7 +186,7 @@ umap_bypass(v)
|
|||
umap_mapids(vp1->v_mount, credp);
|
||||
|
||||
if (umap_bug_bypass && credp->cr_uid != 0)
|
||||
kprintf("umap_bypass: user now %d, group %d\n",
|
||||
printf("umap_bypass: user now %d, group %d\n",
|
||||
credp->cr_uid, credp->cr_gid);
|
||||
}
|
||||
|
||||
|
|
@ -205,7 +205,7 @@ umap_bypass(v)
|
|||
compcredp = (*compnamepp)->cn_cred;
|
||||
|
||||
if (umap_bug_bypass && compcredp->cr_uid != 0)
|
||||
kprintf("umap_bypass: component credit user was %d, group %d\n",
|
||||
printf("umap_bypass: component credit user was %d, group %d\n",
|
||||
compcredp->cr_uid, compcredp->cr_gid);
|
||||
|
||||
/* Map all ids in the credential structure. */
|
||||
|
|
@ -213,7 +213,7 @@ umap_bypass(v)
|
|||
umap_mapids(vp1->v_mount, compcredp);
|
||||
|
||||
if (umap_bug_bypass && compcredp->cr_uid != 0)
|
||||
kprintf("umap_bypass: component credit user now %d, group %d\n",
|
||||
printf("umap_bypass: component credit user now %d, group %d\n",
|
||||
compcredp->cr_uid, compcredp->cr_gid);
|
||||
}
|
||||
|
||||
|
|
@ -260,28 +260,28 @@ umap_bypass(v)
|
|||
*/
|
||||
if (descp->vdesc_cred_offset != VDESC_NO_OFFSET) {
|
||||
if (umap_bug_bypass && credp && credp->cr_uid != 0)
|
||||
kprintf("umap_bypass: returning-user was %d\n",
|
||||
printf("umap_bypass: returning-user was %d\n",
|
||||
credp->cr_uid);
|
||||
|
||||
if (savecredp != NOCRED) {
|
||||
crfree(credp);
|
||||
*credpp = savecredp;
|
||||
if (umap_bug_bypass && credpp && (*credpp)->cr_uid != 0)
|
||||
kprintf("umap_bypass: returning-user now %d\n\n",
|
||||
printf("umap_bypass: returning-user now %d\n\n",
|
||||
savecredp->cr_uid);
|
||||
}
|
||||
}
|
||||
|
||||
if (descp->vdesc_componentname_offset != VDESC_NO_OFFSET) {
|
||||
if (umap_bug_bypass && compcredp && compcredp->cr_uid != 0)
|
||||
kprintf("umap_bypass: returning-component-user was %d\n",
|
||||
printf("umap_bypass: returning-component-user was %d\n",
|
||||
compcredp->cr_uid);
|
||||
|
||||
if (savecompcredp != NOCRED) {
|
||||
crfree(compcredp);
|
||||
(*compnamepp)->cn_cred = savecompcredp;
|
||||
if (umap_bug_bypass && credpp && (*credpp)->cr_uid != 0)
|
||||
kprintf("umap_bypass: returning-component-user now %d\n",
|
||||
printf("umap_bypass: returning-component-user now %d\n",
|
||||
savecompcredp->cr_uid);
|
||||
}
|
||||
}
|
||||
|
|
@ -332,7 +332,7 @@ umap_getattr(v)
|
|||
uid = ap->a_vap->va_uid;
|
||||
gid = ap->a_vap->va_gid;
|
||||
if (umap_bug_bypass)
|
||||
kprintf("umap_getattr: mapped uid = %d, mapped gid = %d\n", uid,
|
||||
printf("umap_getattr: mapped uid = %d, mapped gid = %d\n", uid,
|
||||
gid);
|
||||
|
||||
vp1p = VOPARG_OFFSETTO(struct vnode**, descp->vdesc_vp_offsets[0], ap);
|
||||
|
|
@ -349,7 +349,7 @@ umap_getattr(v)
|
|||
if (tmpid != -1) {
|
||||
ap->a_vap->va_uid = (uid_t) tmpid;
|
||||
if (umap_bug_bypass)
|
||||
kprintf("umap_getattr: original uid = %d\n", uid);
|
||||
printf("umap_getattr: original uid = %d\n", uid);
|
||||
} else
|
||||
ap->a_vap->va_uid = (uid_t) NOBODY;
|
||||
|
||||
|
|
@ -360,7 +360,7 @@ umap_getattr(v)
|
|||
if (tmpid != -1) {
|
||||
ap->a_vap->va_gid = (gid_t) tmpid;
|
||||
if (umap_bug_bypass)
|
||||
kprintf("umap_getattr: original gid = %d\n", gid);
|
||||
printf("umap_getattr: original gid = %d\n", gid);
|
||||
} else
|
||||
ap->a_vap->va_gid = (gid_t) NULLGROUP;
|
||||
|
||||
|
|
@ -453,7 +453,7 @@ umap_print(v)
|
|||
struct vnode *a_vp;
|
||||
} */ *ap = v;
|
||||
struct vnode *vp = ap->a_vp;
|
||||
kprintf("\ttag VT_UMAPFS, vp=%p, lowervp=%p\n", vp,
|
||||
printf("\ttag VT_UMAPFS, vp=%p, lowervp=%p\n", vp,
|
||||
UMAPVPTOLOWERVP(vp));
|
||||
return (0);
|
||||
}
|
||||
|
|
@ -489,7 +489,7 @@ umap_rename(v)
|
|||
compcredp = compnamep->cn_cred = crdup(savecompcredp);
|
||||
|
||||
if (umap_bug_bypass && compcredp->cr_uid != 0)
|
||||
kprintf("umap_rename: rename component credit user was %d, group %d\n",
|
||||
printf("umap_rename: rename component credit user was %d, group %d\n",
|
||||
compcredp->cr_uid, compcredp->cr_gid);
|
||||
|
||||
/* Map all ids in the credential structure. */
|
||||
|
|
@ -497,7 +497,7 @@ umap_rename(v)
|
|||
umap_mapids(vp->v_mount, compcredp);
|
||||
|
||||
if (umap_bug_bypass && compcredp->cr_uid != 0)
|
||||
kprintf("umap_rename: rename component credit user now %d, group %d\n",
|
||||
printf("umap_rename: rename component credit user now %d, group %d\n",
|
||||
compcredp->cr_uid, compcredp->cr_gid);
|
||||
|
||||
error = umap_bypass(ap);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: union_subr.c,v 1.19 1996/10/10 22:54:23 christos Exp $ */
|
||||
/* $NetBSD: union_subr.c,v 1.20 1996/10/13 02:21:45 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1994 Jan-Simon Pendry
|
||||
|
|
@ -235,7 +235,7 @@ union_newsize(vp, uppersz, lowersz)
|
|||
|
||||
if (sz != VNOVAL) {
|
||||
#ifdef UNION_DIAGNOSTIC
|
||||
kprintf("union: %s size now %ld\n",
|
||||
printf("union: %s size now %ld\n",
|
||||
uppersz != VNOVAL ? "upper" : "lower", (long) sz);
|
||||
#endif
|
||||
vnode_pager_setsize(vp, sz);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: union_vfsops.c,v 1.13 1996/10/10 22:54:24 christos Exp $ */
|
||||
/* $NetBSD: union_vfsops.c,v 1.14 1996/10/13 02:21:48 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1994 The Regents of the University of California.
|
||||
|
|
@ -91,7 +91,7 @@ union_mount(mp, path, data, ndp, p)
|
|||
size_t size;
|
||||
|
||||
#ifdef UNION_DIAGNOSTIC
|
||||
kprintf("union_mount(mp = %x)\n", mp);
|
||||
printf("union_mount(mp = %x)\n", mp);
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
|
@ -243,7 +243,7 @@ union_mount(mp, path, data, ndp, p)
|
|||
bzero(cp + size, len - size);
|
||||
|
||||
#ifdef UNION_DIAGNOSTIC
|
||||
kprintf("union_mount: from %s, on %s\n",
|
||||
printf("union_mount: from %s, on %s\n",
|
||||
mp->mnt_stat.f_mntfromname, mp->mnt_stat.f_mntonname);
|
||||
#endif
|
||||
return (0);
|
||||
|
|
@ -293,7 +293,7 @@ union_unmount(mp, mntflags, p)
|
|||
extern int doforce;
|
||||
|
||||
#ifdef UNION_DIAGNOSTIC
|
||||
kprintf("union_unmount(mp = %x)\n", mp);
|
||||
printf("union_unmount(mp = %x)\n", mp);
|
||||
#endif
|
||||
|
||||
if (mntflags & MNT_FORCE) {
|
||||
|
|
@ -434,7 +434,7 @@ union_statfs(mp, sbp, p)
|
|||
int lbsize;
|
||||
|
||||
#ifdef UNION_DIAGNOSTIC
|
||||
kprintf("union_statfs(mp = %x, lvp = %x, uvp = %x)\n", mp,
|
||||
printf("union_statfs(mp = %x, lvp = %x, uvp = %x)\n", mp,
|
||||
um->um_lowervp, um->um_uppervp);
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: union_vnops.c,v 1.34 1996/10/10 22:54:25 christos Exp $ */
|
||||
/* $NetBSD: union_vnops.c,v 1.35 1996/10/13 02:21:49 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1992, 1993, 1994 The Regents of the University of California.
|
||||
|
|
@ -1127,7 +1127,7 @@ union_link(v)
|
|||
|
||||
#ifdef DIAGNOSTIC
|
||||
if (!(ap->a_cnp->cn_flags & LOCKPARENT)) {
|
||||
kprintf("union_link called without LOCKPARENT set!\n");
|
||||
printf("union_link called without LOCKPARENT set!\n");
|
||||
error = EIO; /* need some error code for "caller is a bozo" */
|
||||
} else
|
||||
#endif
|
||||
|
|
@ -1695,7 +1695,7 @@ union_print(v)
|
|||
} */ *ap = v;
|
||||
struct vnode *vp = ap->a_vp;
|
||||
|
||||
kprintf("\ttag VT_UNION, vp=%p, uppervp=%p, lowervp=%p\n",
|
||||
printf("\ttag VT_UNION, vp=%p, uppervp=%p, lowervp=%p\n",
|
||||
vp, UPPERVP(vp), LOWERVP(vp));
|
||||
if (UPPERVP(vp))
|
||||
vprint("uppervp", UPPERVP(vp));
|
||||
|
|
|
|||
Loading…
Reference in New Issue