revert kprintf changes trunk
authorchristos <christos@NetBSD.org>
Sun, 13 Oct 1996 01:39:03 +0000
branchtrunk
changeset 22583 82486974c296
parent 22582 e373019fc540
child 22584 53116e0d665f
revert kprintf changes
sys/nfs/krpc_subr.c
sys/nfs/nfs_bio.c
sys/nfs/nfs_boot.c
sys/nfs/nfs_nqlease.c
sys/nfs/nfs_socket.c
sys/nfs/nfs_subs.c
sys/nfs/nfs_syscalls.c
sys/nfs/nfs_vfsops.c
sys/nfs/nfs_vnops.c
--- a/sys/nfs/krpc_subr.c	Sun Oct 13 01:37:04 1996 +0000
+++ b/sys/nfs/krpc_subr.c	Sun Oct 13 01:39:03 1996 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: krpc_subr.c,v 1.17 1996/10/10 23:31:17 christos Exp $	*/
+/*	$NetBSD: krpc_subr.c,v 1.18 1996/10/13 01:39:03 christos Exp $	*/
 
 /*
  * Copyright (c) 1995 Gordon Ross, Adam Glass
@@ -258,7 +258,7 @@
 			 tport > IPPORT_RESERVED / 2);
 	m_freem(m);
 	if (error) {
-		kprintf("bind failed\n");
+		printf("bind failed\n");
 		goto out;
 	}
 
@@ -320,7 +320,7 @@
 		}
 		error = sosend(so, nam, NULL, m, NULL, 0);
 		if (error) {
-			kprintf("krpc_call: sosend: %d\n", error);
+			printf("krpc_call: sosend: %d\n", error);
 			goto out;
 		}
 		m = NULL;
@@ -329,7 +329,7 @@
 		if (timo < MAX_RESEND_DELAY)
 			timo++;
 		else
-			kprintf("RPC timeout for server 0x%x\n",
+			printf("RPC timeout for server 0x%x\n",
 			       ntohl(sin->sin_addr.s_addr));
 
 		/*
@@ -374,14 +374,14 @@
 			/* Was RPC accepted? (authorization OK) */
 			if (reply->rp_astatus != 0) {
 				error = fxdr_unsigned(u_int32_t, reply->rp_errno);
-				kprintf("rpc denied, error=%d\n", error);
+				printf("rpc denied, error=%d\n", error);
 				continue;
 			}
 
 			/* Did the call succeed? */
 			if (reply->rp_status != 0) {
 				error = fxdr_unsigned(u_int32_t, reply->rp_status);
-				kprintf("rpc denied, status=%d\n", error);
+				printf("rpc denied, status=%d\n", error);
 				continue;
 			}
 
--- a/sys/nfs/nfs_bio.c	Sun Oct 13 01:37:04 1996 +0000
+++ b/sys/nfs/nfs_bio.c	Sun Oct 13 01:39:03 1996 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_bio.c,v 1.28 1996/10/10 23:31:18 christos Exp $	*/
+/*	$NetBSD: nfs_bio.c,v 1.29 1996/10/13 01:39:04 christos Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -186,7 +186,7 @@
 		case VDIR:
 			break;
 		default:
-			kprintf(" NQNFSNONCACHE: type %x unexpected\n",	
+			printf(" NQNFSNONCACHE: type %x unexpected\n",	
 			    vp->v_type);
 		};
 	    }
@@ -359,7 +359,7 @@
 		got_buf = 1;
 		break;
 	    default:
-		kprintf(" nfsbioread: type %x unexpected\n",vp->v_type);
+		printf(" nfsbioread: type %x unexpected\n",vp->v_type);
 		break;
 	    };
 
@@ -379,7 +379,7 @@
 			bp->b_flags |= B_INVAL;
 		break;
 	    default:
-		kprintf(" nfsbioread: type %x unexpected\n",vp->v_type);
+		printf(" nfsbioread: type %x unexpected\n",vp->v_type);
 	    }
 	    if (got_buf)
 		brelse(bp);
@@ -855,7 +855,7 @@
 			error = nfs_readdirrpc(vp, uiop, cr);
 		break;
 	    default:
-		kprintf("nfs_doio:  type %x unexpected\n",vp->v_type);
+		printf("nfs_doio:  type %x unexpected\n",vp->v_type);
 		break;
 	    };
 	    if (error) {
@@ -876,7 +876,7 @@
 		iomode = NFSV3WRITE_FILESYNC;
 	    bp->b_flags |= B_WRITEINPROG;
 #ifdef fvdl_debug
-	    kprintf("nfs_doio(%x): bp %x doff %d dend %d\n", 
+	    printf("nfs_doio(%x): bp %x doff %d dend %d\n", 
 		vp, bp, bp->b_dirtyoff, bp->b_dirtyend);
 #endif
 	    error = nfs_writerpc(vp, uiop, cr, &iomode, &must_commit);
--- a/sys/nfs/nfs_boot.c	Sun Oct 13 01:37:04 1996 +0000
+++ b/sys/nfs/nfs_boot.c	Sun Oct 13 01:39:03 1996 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_boot.c,v 1.27 1996/10/10 23:31:19 christos Exp $	*/
+/*	$NetBSD: nfs_boot.c,v 1.28 1996/10/13 01:39:05 christos Exp $	*/
 
 /*
  * Copyright (c) 1995 Adam Glass, Gordon Ross
@@ -144,7 +144,7 @@
 	if (ifp == NULL)
 		panic("nfs_boot: no suitable interface");
 	bcopy(ifp->if_xname, ireq.ifr_name, IFNAMSIZ);
-	kprintf("nfs_boot: using network interface '%s'\n",
+	printf("nfs_boot: using network interface '%s'\n",
 	    ireq.ifr_name);
 
 	/*
@@ -168,7 +168,7 @@
 	 */
 	if ((error = revarpwhoami(&my_ip, ifp)) != 0)
 		panic("revarp failed, error=%d", error);
-	kprintf("nfs_boot: client_addr=0x%x\n", (u_int32_t)ntohl(my_ip.s_addr));
+	printf("nfs_boot: client_addr=0x%x\n", (u_int32_t)ntohl(my_ip.s_addr));
 
 	/*
 	 * Do enough of ifconfig(8) so that the chosen interface
@@ -203,9 +203,9 @@
 	error = bp_whoami(&bp_sin, &my_ip, &gw_ip);
 	if (error)
 		panic("nfs_boot: bootparam whoami, error=%d", error);
-	kprintf("nfs_boot: server_addr=0x%x\n",
+	printf("nfs_boot: server_addr=0x%x\n",
 		   (u_int32_t)ntohl(bp_sin.sin_addr.s_addr));
-	kprintf("nfs_boot: hostname=%s\n", hostname);
+	printf("nfs_boot: hostname=%s\n", hostname);
 
 #ifdef	NFS_BOOT_GATEWAY
 	/*
@@ -236,12 +236,12 @@
 		/* Mask: (zero length) */
 		bzero(&mask, sizeof(mask));
 
-		kprintf("nfs_boot: gateway=0x%x\n", ntohl(gw_ip.s_addr));
+		printf("nfs_boot: gateway=0x%x\n", ntohl(gw_ip.s_addr));
 		/* add, dest, gw, mask, flags, 0 */
 		error = rtrequest(RTM_ADD, &dst, (struct sockaddr *)&gw,
 		    &mask, (RTF_UP | RTF_GATEWAY | RTF_STATIC), NULL);
 		if (error)
-			kprintf("nfs_boot: add route, error=%d\n", error);
+			printf("nfs_boot: add route, error=%d\n", error);
 	}
 #endif
 
@@ -401,7 +401,7 @@
 	goto out;
 
 bad:
-	kprintf("nfs_boot: bootparam_whoami: bad reply\n");
+	printf("nfs_boot: bootparam_whoami: bad reply\n");
 	error = EBADRPC;
 
 out:
@@ -485,7 +485,7 @@
 	goto out;
 
 bad:
-	kprintf("nfs_boot: bootparam_getfile: bad reply\n");
+	printf("nfs_boot: bootparam_getfile: bad reply\n");
 	error = EBADRPC;
 
 out:
--- a/sys/nfs/nfs_nqlease.c	Sun Oct 13 01:37:04 1996 +0000
+++ b/sys/nfs/nfs_nqlease.c	Sun Oct 13 01:39:03 1996 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_nqlease.c,v 1.15 1996/10/10 23:31:20 christos Exp $	*/
+/*	$NetBSD: nfs_nqlease.c,v 1.16 1996/10/13 01:39:06 christos Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -276,10 +276,10 @@
 	/*
 	 * Allocate new lease
 	 * The value of nqsrv_maxnumlease should be set generously, so that
-	 * the following "kprintf" happens infrequently.
+	 * the following "printf" happens infrequently.
 	 */
 	if (nfsstats.srvnqnfs_leases > nqsrv_maxnumlease) {
-		kprintf("Nqnfs server, too many leases\n");
+		printf("Nqnfs server, too many leases\n");
 		do {
 			(void) tsleep((caddr_t)&lbolt, PSOCK,
 					"nqsrvnuml", 0);
@@ -501,7 +501,7 @@
 				m = m->m_next;
 			}
 			if (siz <= 0 || siz > NFS_MAXPACKET) {
-				kprintf("mbuf siz=%d\n",siz);
+				printf("mbuf siz=%d\n",siz);
 				panic("Bad nfs svc reply");
 			}
 			m = nfsm_rpchead(cred, (NFSMNT_NFSV3 | NFSMNT_NQNFS),
--- a/sys/nfs/nfs_socket.c	Sun Oct 13 01:37:04 1996 +0000
+++ b/sys/nfs/nfs_socket.c	Sun Oct 13 01:39:03 1996 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_socket.c,v 1.30 1996/10/10 23:31:21 christos Exp $	*/
+/*	$NetBSD: nfs_socket.c,v 1.31 1996/10/13 01:39:07 christos Exp $	*/
 
 /*
  * Copyright (c) 1989, 1991, 1993, 1995
@@ -562,7 +562,7 @@
 			} while (error == EWOULDBLOCK ||
 				 (!error && *mp == NULL && control));
 			if ((rcvflg & MSG_EOR) == 0)
-				kprintf("Egad!!\n");
+				printf("Egad!!\n");
 			if (!error && *mp == NULL)
 				error = EPIPE;
 			len -= auio.uio_resid;
@@ -1702,7 +1702,7 @@
 			nfsm_dissect(tl, u_int32_t *, 2 * NFSX_UNSIGNED);
 			if (*tl++ != rpc_auth_kerb ||
 				fxdr_unsigned(int, *tl) != 4 * NFSX_UNSIGNED) {
-				kprintf("Bad kerb verifier\n");
+				printf("Bad kerb verifier\n");
 				nd->nd_repstat = (NFSERR_AUTHERR|AUTH_BADVERF);
 				nd->nd_procnum = NFSPROC_NOOP;
 				return (0);
@@ -1710,7 +1710,7 @@
 			nfsm_dissect(cp, caddr_t, 4 * NFSX_UNSIGNED);
 			tl = (u_int32_t *)cp;
 			if (fxdr_unsigned(int, *tl) != RPCAKN_FULLNAME) {
-				kprintf("Not fullname kerb verifier\n");
+				printf("Not fullname kerb verifier\n");
 				nd->nd_repstat = (NFSERR_AUTHERR|AUTH_BADVERF);
 				nd->nd_procnum = NFSPROC_NOOP;
 				return (0);
@@ -1723,7 +1723,7 @@
 			break;
 		case RPCAKN_NICKNAME:
 			if (len != 2 * NFSX_UNSIGNED) {
-				kprintf("Kerb nickname short\n");
+				printf("Kerb nickname short\n");
 				nd->nd_repstat = (NFSERR_AUTHERR|AUTH_BADCRED);
 				nd->nd_procnum = NFSPROC_NOOP;
 				return (0);
@@ -1732,7 +1732,7 @@
 			nfsm_dissect(tl, u_int32_t *, 2 * NFSX_UNSIGNED);
 			if (*tl++ != rpc_auth_kerb ||
 				fxdr_unsigned(int, *tl) != 3 * NFSX_UNSIGNED) {
-				kprintf("Kerb nick verifier bad\n");
+				printf("Kerb nick verifier bad\n");
 				nd->nd_repstat = (NFSERR_AUTHERR|AUTH_BADVERF);
 				nd->nd_procnum = NFSPROC_NOOP;
 				return (0);
--- a/sys/nfs/nfs_subs.c	Sun Oct 13 01:37:04 1996 +0000
+++ b/sys/nfs/nfs_subs.c	Sun Oct 13 01:39:03 1996 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_subs.c,v 1.31 1996/10/10 23:31:22 christos Exp $	*/
+/*	$NetBSD: nfs_subs.c,v 1.32 1996/10/13 01:39:08 christos Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -1080,20 +1080,20 @@
 	 * Check to see if major data structures haven't bloated.
 	 */
 	if (sizeof (struct nfsnode) > NFS_NODEALLOC) {
-		kprintf("struct nfsnode bloated (> %dbytes)\n", NFS_NODEALLOC);
-		kprintf("Try reducing NFS_SMALLFH\n");
+		printf("struct nfsnode bloated (> %dbytes)\n", NFS_NODEALLOC);
+		printf("Try reducing NFS_SMALLFH\n");
 	}
 	if (sizeof (struct nfsmount) > NFS_MNTALLOC) {
-		kprintf("struct nfsmount bloated (> %dbytes)\n", NFS_MNTALLOC);
-		kprintf("Try reducing NFS_MUIDHASHSIZ\n");
+		printf("struct nfsmount bloated (> %dbytes)\n", NFS_MNTALLOC);
+		printf("Try reducing NFS_MUIDHASHSIZ\n");
 	}
 	if (sizeof (struct nfssvc_sock) > NFS_SVCALLOC) {
-		kprintf("struct nfssvc_sock bloated (> %dbytes)\n",NFS_SVCALLOC);
-		kprintf("Try reducing NFS_UIDHASHSIZ\n");
+		printf("struct nfssvc_sock bloated (> %dbytes)\n",NFS_SVCALLOC);
+		printf("Try reducing NFS_UIDHASHSIZ\n");
 	}
 	if (sizeof (struct nfsuid) > NFS_UIDALLOC) {
-		kprintf("struct nfsuid bloated (> %dbytes)\n",NFS_UIDALLOC);
-		kprintf("Try unionizing the nu_nickname and nu_flag fields\n");
+		printf("struct nfsuid bloated (> %dbytes)\n",NFS_UIDALLOC);
+		printf("Try unionizing the nu_nickname and nu_flag fields\n");
 	}
 #endif
 
--- a/sys/nfs/nfs_syscalls.c	Sun Oct 13 01:37:04 1996 +0000
+++ b/sys/nfs/nfs_syscalls.c	Sun Oct 13 01:39:03 1996 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_syscalls.c,v 1.20 1996/10/10 23:31:24 christos Exp $	*/
+/*	$NetBSD: nfs_syscalls.c,v 1.21 1996/10/13 01:39:09 christos Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -644,7 +644,7 @@
 				m = m->m_next;
 			}
 			if (siz <= 0 || siz > NFS_MAXPACKET) {
-				kprintf("mbuf siz=%d\n",siz);
+				printf("mbuf siz=%d\n",siz);
 				panic("Bad nfs svc reply");
 			}
 			m = mreq;
--- a/sys/nfs/nfs_vfsops.c	Sun Oct 13 01:37:04 1996 +0000
+++ b/sys/nfs/nfs_vfsops.c	Sun Oct 13 01:39:03 1996 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_vfsops.c,v 1.50 1996/10/10 23:31:25 christos Exp $	*/
+/*	$NetBSD: nfs_vfsops.c,v 1.51 1996/10/13 01:39:10 christos Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993, 1995
@@ -291,7 +291,7 @@
 	 */
 	nfs_boot_getfh(&nd.nd_boot, "root", &nd.nd_root);
 	mp = nfs_mount_diskless(&nd.nd_root, "/", 0, &vp);
-	kprintf("root on %s\n", nd.nd_root.ndm_host);
+	printf("root on %s\n", nd.nd_root.ndm_host);
 
 	/*
 	 * Link it into the mount list.
@@ -316,7 +316,7 @@
 	if (error) panic("nfs_mountroot: getattr for root");
 	n = attr.va_mtime.tv_sec;
 #ifdef	DEBUG
-	kprintf("root time: 0x%lx\n", n);
+	printf("root time: 0x%lx\n", n);
 #endif
 	inittodr(n);
 
@@ -345,7 +345,7 @@
 	if (bdevvp(swapdev, &swapdev_vp))
 		panic("nfs_mountroot: can't setup swap vp");
 	if (swdevt[0].sw_dev != NODEV) {
-		kprintf("swap on device 0x%x\n", swdevt[0].sw_dev);
+		printf("swap on device 0x%x\n", swdevt[0].sw_dev);
 		return (0);
 	}
 
@@ -359,7 +359,7 @@
 #ifdef Lite2_integrated
 	vfs_unbusy(mp, procp);
 #endif
-	kprintf("swap on %s\n", nd.nd_swap.ndm_host);
+	printf("swap on %s\n", nd.nd_swap.ndm_host);
 
 	/*
 	 * Since the swap file is not the root dir of a file system,
@@ -377,7 +377,7 @@
 		panic("nfs_mountroot: getattr for swap");
 	n = (long) (attr.va_size >> DEV_BSHIFT);
 #ifdef	DEBUG
-	kprintf("swap size: 0x%lx (blocks)\n", n);
+	printf("swap size: 0x%lx (blocks)\n", n);
 #endif
 	swdevt[0].sw_nblks = n;
 
@@ -547,7 +547,7 @@
 		nfs_disconnect(nmp);
 		if (nmp->nm_sotype == SOCK_DGRAM)
 			while (nfs_connect(nmp, (struct nfsreq *)0)) {
-				kprintf("nfs_args: retrying connect\n");
+				printf("nfs_args: retrying connect\n");
 				(void) tsleep((caddr_t)&lbolt,
 					      PSOCK, "nfscon", 0);
 			}
--- a/sys/nfs/nfs_vnops.c	Sun Oct 13 01:37:04 1996 +0000
+++ b/sys/nfs/nfs_vnops.c	Sun Oct 13 01:39:03 1996 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_vnops.c,v 1.66 1996/10/10 23:31:26 christos Exp $	*/
+/*	$NetBSD: nfs_vnops.c,v 1.67 1996/10/13 01:39:11 christos Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -397,7 +397,7 @@
 
 	if (vp->v_type != VREG && vp->v_type != VDIR && vp->v_type != VLNK) {
 #ifdef DIAGNOSTIC
-		kprintf("open eacces vtyp=%d\n",vp->v_type);
+		printf("open eacces vtyp=%d\n",vp->v_type);
 #endif
 		return (EACCES);
 	}
@@ -2164,7 +2164,7 @@
 		dnp->n_direofoffset = uiop->uio_offset;
 	else {
 		if (uiop->uio_resid > 0)
-			kprintf("EEK! readdirrpc resid > 0\n");
+			printf("EEK! readdirrpc resid > 0\n");
 		cookiep = nfs_getcookie(dnp, uiop->uio_offset, 1);
 		*cookiep = cookie;
 	}
@@ -2388,7 +2388,7 @@
 		dnp->n_direofoffset = uiop->uio_offset;
 	else {
 		if (uiop->uio_resid > 0)
-			kprintf("EEK! readdirplusrpc resid > 0\n");
+			printf("EEK! readdirplusrpc resid > 0\n");
 		cookiep = nfs_getcookie(dnp, uiop->uio_offset, 1);
 		*cookiep = cookie;
 	}
@@ -2939,13 +2939,13 @@
 	register struct vnode *vp = ap->a_vp;
 	register struct nfsnode *np = VTONFS(vp);
 
-	kprintf("tag VT_NFS, fileid %ld fsid 0x%lx",
+	printf("tag VT_NFS, fileid %ld fsid 0x%lx",
 	    np->n_vattr.va_fileid, np->n_vattr.va_fsid);
 #ifdef FIFO
 	if (vp->v_type == VFIFO)
 		fifo_printinfo(vp);
 #endif
-	kprintf("\n");
+	printf("\n");
 	return (0);
 }
 
@@ -3021,7 +3021,7 @@
 		panic("bwrite: buffer is not busy???");
 
 #ifdef fvdl_debug
-	kprintf("nfs_writebp(%x): vp %x voff %d vend %d doff %d dend %d\n",
+	printf("nfs_writebp(%x): vp %x voff %d vend %d doff %d dend %d\n",
 	    bp, bp->b_vp, bp->b_validoff, bp->b_validend, bp->b_dirtyoff,
 	    bp->b_dirtyend);
 #endif