revert previous kprintf changes
This commit is contained in:
christos
parent
3dc7953eec
commit
90c7de0919
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: ffs_alloc.c,v 1.12 1996/10/10 17:21:13 christos Exp $ */
|
||||
/* $NetBSD: ffs_alloc.c,v 1.13 1996/10/12 21:58:44 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1982, 1986, 1989, 1993
|
||||
@ -105,7 +105,7 @@ ffs_alloc(ip, lbn, bpref, size, cred, bnp)
|
||||
fs = ip->i_fs;
|
||||
#ifdef DIAGNOSTIC
|
||||
if ((u_int)size > fs->fs_bsize || fragoff(fs, size) != 0) {
|
||||
kprintf("dev = 0x%x, bsize = %d, size = %d, fs = %s\n",
|
||||
printf("dev = 0x%x, bsize = %d, size = %d, fs = %s\n",
|
||||
ip->i_dev, fs->fs_bsize, size, fs->fs_fsmnt);
|
||||
panic("ffs_alloc: bad size");
|
||||
}
|
||||
@ -173,7 +173,7 @@ ffs_realloccg(ip, lbprev, bpref, osize, nsize, cred, bpp)
|
||||
#ifdef DIAGNOSTIC
|
||||
if ((u_int)osize > fs->fs_bsize || fragoff(fs, osize) != 0 ||
|
||||
(u_int)nsize > fs->fs_bsize || fragoff(fs, nsize) != 0) {
|
||||
kprintf(
|
||||
printf(
|
||||
"dev = 0x%x, bsize = %d, osize = %d, nsize = %d, fs = %s\n",
|
||||
ip->i_dev, fs->fs_bsize, osize, nsize, fs->fs_fsmnt);
|
||||
panic("ffs_realloccg: bad size");
|
||||
@ -184,7 +184,7 @@ ffs_realloccg(ip, lbprev, bpref, osize, nsize, cred, bpp)
|
||||
if (cred->cr_uid != 0 && freespace(fs, fs->fs_minfree) <= 0)
|
||||
goto nospace;
|
||||
if ((bprev = ip->i_db[lbprev]) == 0) {
|
||||
kprintf("dev = 0x%x, bsize = %d, bprev = %d, fs = %s\n",
|
||||
printf("dev = 0x%x, bsize = %d, bprev = %d, fs = %s\n",
|
||||
ip->i_dev, fs->fs_bsize, bprev, fs->fs_fsmnt);
|
||||
panic("ffs_realloccg: bad bprev");
|
||||
}
|
||||
@ -259,7 +259,7 @@ ffs_realloccg(ip, lbprev, bpref, osize, nsize, cred, bpp)
|
||||
fs->fs_optim = FS_OPTSPACE;
|
||||
break;
|
||||
default:
|
||||
kprintf("dev = 0x%x, optim = %d, fs = %s\n",
|
||||
printf("dev = 0x%x, optim = %d, fs = %s\n",
|
||||
ip->i_dev, fs->fs_optim, fs->fs_fsmnt);
|
||||
panic("ffs_realloccg: bad optim");
|
||||
/* NOTREACHED */
|
||||
@ -414,7 +414,7 @@ ffs_reallocblks(v)
|
||||
*/
|
||||
#ifdef DEBUG
|
||||
if (prtrealloc)
|
||||
kprintf("realloc: ino %d, lbns %d-%d\n\told:", ip->i_number,
|
||||
printf("realloc: ino %d, lbns %d-%d\n\told:", ip->i_number,
|
||||
start_lbn, end_lbn);
|
||||
#endif
|
||||
blkno = newblk;
|
||||
@ -427,7 +427,7 @@ ffs_reallocblks(v)
|
||||
#endif
|
||||
#ifdef DEBUG
|
||||
if (prtrealloc)
|
||||
kprintf(" %d,", *bap);
|
||||
printf(" %d,", *bap);
|
||||
#endif
|
||||
*bap++ = blkno;
|
||||
}
|
||||
@ -467,7 +467,7 @@ ffs_reallocblks(v)
|
||||
*/
|
||||
#ifdef DEBUG
|
||||
if (prtrealloc)
|
||||
kprintf("\n\tnew:");
|
||||
printf("\n\tnew:");
|
||||
#endif
|
||||
for (blkno = newblk, i = 0; i < len; i++, blkno += fs->fs_frag) {
|
||||
ffs_blkfree(ip, dbtofsb(fs, buflist->bs_children[i]->b_blkno),
|
||||
@ -475,13 +475,13 @@ ffs_reallocblks(v)
|
||||
buflist->bs_children[i]->b_blkno = fsbtodb(fs, blkno);
|
||||
#ifdef DEBUG
|
||||
if (prtrealloc)
|
||||
kprintf(" %d,", blkno);
|
||||
printf(" %d,", blkno);
|
||||
#endif
|
||||
}
|
||||
#ifdef DEBUG
|
||||
if (prtrealloc) {
|
||||
prtrealloc--;
|
||||
kprintf("\n");
|
||||
printf("\n");
|
||||
}
|
||||
#endif
|
||||
return (0);
|
||||
@ -550,12 +550,12 @@ ffs_valloc(v)
|
||||
}
|
||||
ip = VTOI(*ap->a_vpp);
|
||||
if (ip->i_mode) {
|
||||
kprintf("mode = 0%o, inum = %d, fs = %s\n",
|
||||
printf("mode = 0%o, inum = %d, fs = %s\n",
|
||||
ip->i_mode, ip->i_number, fs->fs_fsmnt);
|
||||
panic("ffs_valloc: dup alloc");
|
||||
}
|
||||
if (ip->i_blocks) { /* XXX */
|
||||
kprintf("free inode %s/%d had %d blocks\n",
|
||||
printf("free inode %s/%d had %d blocks\n",
|
||||
fs->fs_fsmnt, ino, ip->i_blocks);
|
||||
ip->i_blocks = 0;
|
||||
}
|
||||
@ -976,7 +976,7 @@ ffs_alloccgblk(fs, cgp, bpref)
|
||||
pos = cylno % fs->fs_cpc;
|
||||
bno = (cylno - pos) * fs->fs_spc / NSPB(fs);
|
||||
if (fs_postbl(fs, pos)[i] == -1) {
|
||||
kprintf("pos = %d, i = %d, fs = %s\n",
|
||||
printf("pos = %d, i = %d, fs = %s\n",
|
||||
pos, i, fs->fs_fsmnt);
|
||||
panic("ffs_alloccgblk: cyl groups corrupted");
|
||||
}
|
||||
@ -991,7 +991,7 @@ ffs_alloccgblk(fs, cgp, bpref)
|
||||
break;
|
||||
i += delta;
|
||||
}
|
||||
kprintf("pos = %d, i = %d, fs = %s\n", pos, i, fs->fs_fsmnt);
|
||||
printf("pos = %d, i = %d, fs = %s\n", pos, i, fs->fs_fsmnt);
|
||||
panic("ffs_alloccgblk: can't find blk in cyl");
|
||||
}
|
||||
norot:
|
||||
@ -1170,7 +1170,7 @@ ffs_nodealloccg(ip, cg, ipref, mode)
|
||||
start = 0;
|
||||
loc = skpc(0xff, len, &cg_inosused(cgp)[0]);
|
||||
if (loc == 0) {
|
||||
kprintf("cg = %d, irotor = %d, fs = %s\n",
|
||||
printf("cg = %d, irotor = %d, fs = %s\n",
|
||||
cg, cgp->cg_irotor, fs->fs_fsmnt);
|
||||
panic("ffs_nodealloccg: map corrupted");
|
||||
/* NOTREACHED */
|
||||
@ -1185,7 +1185,7 @@ ffs_nodealloccg(ip, cg, ipref, mode)
|
||||
goto gotit;
|
||||
}
|
||||
}
|
||||
kprintf("fs = %s\n", fs->fs_fsmnt);
|
||||
printf("fs = %s\n", fs->fs_fsmnt);
|
||||
panic("ffs_nodealloccg: block not in map");
|
||||
/* NOTREACHED */
|
||||
gotit:
|
||||
@ -1224,13 +1224,13 @@ ffs_blkfree(ip, bno, size)
|
||||
|
||||
fs = ip->i_fs;
|
||||
if ((u_int)size > fs->fs_bsize || fragoff(fs, size) != 0) {
|
||||
kprintf("dev = 0x%x, bsize = %d, size = %ld, fs = %s\n",
|
||||
printf("dev = 0x%x, bsize = %d, size = %ld, fs = %s\n",
|
||||
ip->i_dev, fs->fs_bsize, size, fs->fs_fsmnt);
|
||||
panic("blkfree: bad size");
|
||||
}
|
||||
cg = dtog(fs, bno);
|
||||
if ((u_int)bno >= fs->fs_size) {
|
||||
kprintf("bad block %d, ino %d\n", bno, ip->i_number);
|
||||
printf("bad block %d, ino %d\n", bno, ip->i_number);
|
||||
ffs_fserr(fs, ip->i_uid, "bad block");
|
||||
return;
|
||||
}
|
||||
@ -1250,7 +1250,7 @@ ffs_blkfree(ip, bno, size)
|
||||
if (size == fs->fs_bsize) {
|
||||
blkno = fragstoblks(fs, bno);
|
||||
if (ffs_isblock(fs, cg_blksfree(cgp), blkno)) {
|
||||
kprintf("dev = 0x%x, block = %d, fs = %s\n",
|
||||
printf("dev = 0x%x, block = %d, fs = %s\n",
|
||||
ip->i_dev, bno, fs->fs_fsmnt);
|
||||
panic("blkfree: freeing free block");
|
||||
}
|
||||
@ -1275,7 +1275,7 @@ ffs_blkfree(ip, bno, size)
|
||||
frags = numfrags(fs, size);
|
||||
for (i = 0; i < frags; i++) {
|
||||
if (isset(cg_blksfree(cgp), bno + i)) {
|
||||
kprintf("dev = 0x%x, block = %d, fs = %s\n",
|
||||
printf("dev = 0x%x, block = %d, fs = %s\n",
|
||||
ip->i_dev, bno + i, fs->fs_fsmnt);
|
||||
panic("blkfree: freeing free frag");
|
||||
}
|
||||
@ -1351,7 +1351,7 @@ ffs_vfree(v)
|
||||
cgp->cg_time = time.tv_sec;
|
||||
ino %= fs->fs_ipg;
|
||||
if (isclr(cg_inosused(cgp), ino)) {
|
||||
kprintf("dev = 0x%x, ino = %d, fs = %s\n",
|
||||
printf("dev = 0x%x, ino = %d, fs = %s\n",
|
||||
pip->i_dev, ino, fs->fs_fsmnt);
|
||||
if (fs->fs_ronly == 0)
|
||||
panic("ifree: freeing free inode");
|
||||
@ -1408,7 +1408,7 @@ ffs_mapsearch(fs, cgp, bpref, allocsiz)
|
||||
(u_char *)fragtbl[fs->fs_frag],
|
||||
(u_char)(1 << (allocsiz - 1 + (fs->fs_frag % NBBY))));
|
||||
if (loc == 0) {
|
||||
kprintf("start = %d, len = %d, fs = %s\n",
|
||||
printf("start = %d, len = %d, fs = %s\n",
|
||||
start, len, fs->fs_fsmnt);
|
||||
panic("ffs_alloccg: map corrupted");
|
||||
/* NOTREACHED */
|
||||
@ -1432,7 +1432,7 @@ ffs_mapsearch(fs, cgp, bpref, allocsiz)
|
||||
subfield <<= 1;
|
||||
}
|
||||
}
|
||||
kprintf("bno = %d, fs = %s\n", bno, fs->fs_fsmnt);
|
||||
printf("bno = %d, fs = %s\n", bno, fs->fs_fsmnt);
|
||||
panic("ffs_alloccg: block not in map");
|
||||
return (-1);
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: ffs_subr.c,v 1.8 1996/10/10 17:21:17 christos Exp $ */
|
||||
/* $NetBSD: ffs_subr.c,v 1.9 1996/10/12 21:58:45 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1982, 1986, 1989, 1993
|
||||
@ -145,7 +145,7 @@ ffs_checkoverlap(bp, ip)
|
||||
ep->b_blkno + btodb(ep->b_bcount) <= start)
|
||||
continue;
|
||||
vprint("Disk overlap", vp);
|
||||
kprintf("\tstart %d, end %d overlap start %d, end %ld\n",
|
||||
printf("\tstart %d, end %d overlap start %d, end %ld\n",
|
||||
start, last, ep->b_blkno,
|
||||
ep->b_blkno + btodb(ep->b_bcount) - 1);
|
||||
panic("Disk buffer overlap");
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: ffs_vfsops.c,v 1.20 1996/10/10 17:21:19 christos Exp $ */
|
||||
/* $NetBSD: ffs_vfsops.c,v 1.21 1996/10/12 21:58:47 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1989, 1991, 1993, 1994
|
||||
@ -272,7 +272,7 @@ ffs_mount(mp, path, data, ndp, p)
|
||||
if (fs->fs_clean & FS_WASCLEAN)
|
||||
fs->fs_time = time.tv_sec;
|
||||
else
|
||||
kprintf("%s: file system not clean; please fsck(8)\n",
|
||||
printf("%s: file system not clean; please fsck(8)\n",
|
||||
mp->mnt_stat.f_mntfromname);
|
||||
(void) ffs_cgupdate(ump, MNT_WAIT);
|
||||
}
|
||||
@ -711,7 +711,7 @@ ffs_sync(mp, waitfor, cred, p)
|
||||
*/
|
||||
if (fs->fs_fmod != 0) {
|
||||
if (fs->fs_ronly != 0) { /* XXX */
|
||||
kprintf("fs = %s\n", fs->fs_fsmnt);
|
||||
printf("fs = %s\n", fs->fs_fsmnt);
|
||||
panic("update: rofs mod");
|
||||
}
|
||||
fs->fs_fmod = 0;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: lfs_alloc.c,v 1.5 1996/10/10 17:21:21 christos Exp $ */
|
||||
/* $NetBSD: lfs_alloc.c,v 1.6 1996/10/12 21:58:49 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1991, 1993
|
||||
@ -82,7 +82,7 @@ lfs_valloc(v)
|
||||
fs = VTOI(ap->a_pvp)->i_lfs;
|
||||
new_ino = fs->lfs_free;
|
||||
#ifdef ALLOCPRINT
|
||||
kprintf("lfs_ialloc: allocate inode %d\n", new_ino);
|
||||
printf("lfs_ialloc: allocate inode %d\n", new_ino);
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: lfs_debug.c,v 1.5 1996/10/10 17:21:22 christos Exp $ */
|
||||
/* $NetBSD: lfs_debug.c,v 1.6 1996/10/12 21:58:50 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1991, 1993
|
||||
@ -53,65 +53,65 @@ lfs_dump_super(lfsp)
|
||||
{
|
||||
int i;
|
||||
|
||||
kprintf("%s%x\t%s%x\t%s%d\t%s%d\n",
|
||||
printf("%s%x\t%s%x\t%s%d\t%s%d\n",
|
||||
"magic ", lfsp->lfs_magic,
|
||||
"version ", lfsp->lfs_version,
|
||||
"size ", lfsp->lfs_size,
|
||||
"ssize ", lfsp->lfs_ssize);
|
||||
kprintf("%s%d\t%s%d\t%s%d\t%s%d\n",
|
||||
printf("%s%d\t%s%d\t%s%d\t%s%d\n",
|
||||
"dsize ", lfsp->lfs_dsize,
|
||||
"bsize ", lfsp->lfs_bsize,
|
||||
"fsize ", lfsp->lfs_fsize,
|
||||
"frag ", lfsp->lfs_frag);
|
||||
|
||||
kprintf("%s%d\t%s%d\t%s%d\t%s%d\n",
|
||||
printf("%s%d\t%s%d\t%s%d\t%s%d\n",
|
||||
"minfree ", lfsp->lfs_minfree,
|
||||
"inopb ", lfsp->lfs_inopb,
|
||||
"ifpb ", lfsp->lfs_ifpb,
|
||||
"nindir ", lfsp->lfs_nindir);
|
||||
|
||||
kprintf("%s%d\t%s%d\t%s%d\t%s%d\n",
|
||||
printf("%s%d\t%s%d\t%s%d\t%s%d\n",
|
||||
"nseg ", lfsp->lfs_nseg,
|
||||
"nspf ", lfsp->lfs_nspf,
|
||||
"cleansz ", lfsp->lfs_cleansz,
|
||||
"segtabsz ", lfsp->lfs_segtabsz);
|
||||
|
||||
kprintf("%s%x\t%s%d\t%s%x\t%s%d\n",
|
||||
printf("%s%x\t%s%d\t%s%x\t%s%d\n",
|
||||
"segmask ", lfsp->lfs_segmask,
|
||||
"segshift ", lfsp->lfs_segshift,
|
||||
"bmask ", lfsp->lfs_bmask,
|
||||
"bshift ", lfsp->lfs_bshift);
|
||||
|
||||
kprintf("%s%x\t%s%d\t%s%x\t%s%d\n",
|
||||
printf("%s%x\t%s%d\t%s%x\t%s%d\n",
|
||||
"ffmask ", lfsp->lfs_ffmask,
|
||||
"ffshift ", lfsp->lfs_ffshift,
|
||||
"fbmask ", lfsp->lfs_fbmask,
|
||||
"fbshift ", lfsp->lfs_fbshift);
|
||||
|
||||
kprintf("%s%d\t%s%d\t%s%x\t%s%qx\n",
|
||||
printf("%s%d\t%s%d\t%s%x\t%s%qx\n",
|
||||
"sushift ", lfsp->lfs_sushift,
|
||||
"fsbtodb ", lfsp->lfs_fsbtodb,
|
||||
"cksum ", lfsp->lfs_cksum,
|
||||
"maxfilesize ", lfsp->lfs_maxfilesize);
|
||||
|
||||
kprintf("Superblock disk addresses:");
|
||||
printf("Superblock disk addresses:");
|
||||
for (i = 0; i < LFS_MAXNUMSB; i++)
|
||||
kprintf(" %x", lfsp->lfs_sboffs[i]);
|
||||
kprintf("\n");
|
||||
printf(" %x", lfsp->lfs_sboffs[i]);
|
||||
printf("\n");
|
||||
|
||||
kprintf("Checkpoint Info\n");
|
||||
kprintf("%s%d\t%s%x\t%s%d\n",
|
||||
printf("Checkpoint Info\n");
|
||||
printf("%s%d\t%s%x\t%s%d\n",
|
||||
"free ", lfsp->lfs_free,
|
||||
"idaddr ", lfsp->lfs_idaddr,
|
||||
"ifile ", lfsp->lfs_ifile);
|
||||
kprintf("%s%x\t%s%d\t%s%x\t%s%x\t%s%x\t%s%x\n",
|
||||
printf("%s%x\t%s%d\t%s%x\t%s%x\t%s%x\t%s%x\n",
|
||||
"bfree ", lfsp->lfs_bfree,
|
||||
"nfiles ", lfsp->lfs_nfiles,
|
||||
"lastseg ", lfsp->lfs_lastseg,
|
||||
"nextseg ", lfsp->lfs_nextseg,
|
||||
"curseg ", lfsp->lfs_curseg,
|
||||
"offset ", lfsp->lfs_offset);
|
||||
kprintf("tstamp %x\n", lfsp->lfs_tstamp);
|
||||
printf("tstamp %x\n", lfsp->lfs_tstamp);
|
||||
}
|
||||
|
||||
void
|
||||
@ -120,21 +120,21 @@ lfs_dump_dinode(dip)
|
||||
{
|
||||
int i;
|
||||
|
||||
kprintf("%s%u\t%s%d\t%s%u\t%s%u\t%s%qu\n",
|
||||
printf("%s%u\t%s%d\t%s%u\t%s%u\t%s%qu\n",
|
||||
"mode ", dip->di_mode,
|
||||
"nlink ", dip->di_nlink,
|
||||
"uid ", dip->di_uid,
|
||||
"gid ", dip->di_gid,
|
||||
"size ", dip->di_size);
|
||||
kprintf("inum %d\n", dip->di_inumber);
|
||||
kprintf("Direct Addresses\n");
|
||||
printf("inum %d\n", dip->di_inumber);
|
||||
printf("Direct Addresses\n");
|
||||
for (i = 0; i < NDADDR; i++) {
|
||||
kprintf("\t%x", dip->di_db[i]);
|
||||
printf("\t%x", dip->di_db[i]);
|
||||
if ((i % 6) == 5)
|
||||
kprintf("\n");
|
||||
printf("\n");
|
||||
}
|
||||
for (i = 0; i < NIADDR; i++)
|
||||
kprintf("\t%x", dip->di_ib[i]);
|
||||
kprintf("\n");
|
||||
printf("\t%x", dip->di_ib[i]);
|
||||
printf("\n");
|
||||
}
|
||||
#endif /* DEBUG */
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: lfs_inode.c,v 1.7 1996/10/10 17:21:24 christos Exp $ */
|
||||
/* $NetBSD: lfs_inode.c,v 1.8 1996/10/12 21:58:50 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1986, 1989, 1991, 1993
|
||||
@ -300,7 +300,7 @@ lfs_truncate(v)
|
||||
|
||||
#ifdef DIAGNOSTIC
|
||||
if (ip->i_blocks < fsbtodb(fs, blocksreleased)) {
|
||||
kprintf("lfs_truncate: block count < 0\n");
|
||||
printf("lfs_truncate: block count < 0\n");
|
||||
blocksreleased = ip->i_blocks;
|
||||
}
|
||||
#endif
|
||||
@ -334,7 +334,7 @@ lfs_truncate(v)
|
||||
blocksreleased = fsbtodb(fs, i_released);
|
||||
#ifdef DIAGNOSTIC
|
||||
if (blocksreleased > ip->i_blocks) {
|
||||
kprintf("lfs_inode: Warning! %s\n",
|
||||
printf("lfs_inode: Warning! %s\n",
|
||||
"more blocks released from inode than are in inode");
|
||||
blocksreleased = ip->i_blocks;
|
||||
}
|
||||
@ -343,7 +343,7 @@ lfs_truncate(v)
|
||||
ip->i_blocks -= blocksreleased;
|
||||
#ifdef DIAGNOSTIC
|
||||
if (length == 0 && ip->i_blocks != 0)
|
||||
kprintf("lfs_inode: Warning! %s%d%s\n",
|
||||
printf("lfs_inode: Warning! %s%d%s\n",
|
||||
"Truncation to zero, but ", ip->i_blocks,
|
||||
" blocks left on inode");
|
||||
#endif
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: lfs_segment.c,v 1.6 1996/10/10 17:21:25 christos Exp $ */
|
||||
/* $NetBSD: lfs_segment.c,v 1.7 1996/10/12 21:58:51 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1991, 1993
|
||||
@ -230,7 +230,7 @@ lfs_segwrite(mp, flags)
|
||||
clean = cip->clean;
|
||||
brelse(bp);
|
||||
if (clean <= 2) {
|
||||
kprintf ("segs clean: %d\n", clean);
|
||||
printf ("segs clean: %d\n", clean);
|
||||
wakeup(&lfs_allclean_wakeup);
|
||||
error = tsleep(&fs->lfs_avail, PRIBIO + 1,
|
||||
"lfs writer", 0);
|
||||
@ -452,7 +452,7 @@ lfs_writeinode(fs, sp, ip)
|
||||
#ifdef DIAGNOSTIC
|
||||
if (sup->su_nbytes < sizeof(struct dinode)) {
|
||||
/* XXX -- Change to a panic. */
|
||||
kprintf("lfs: negative bytes (segment %d)\n",
|
||||
printf("lfs: negative bytes (segment %d)\n",
|
||||
datosn(fs, daddr));
|
||||
panic("negative bytes");
|
||||
}
|
||||
@ -603,7 +603,7 @@ lfs_updatemeta(sp)
|
||||
* to get counted for the inode.
|
||||
*/
|
||||
if (bp->b_blkno == -1 && !(bp->b_flags & B_CACHE)) {
|
||||
kprintf ("Updatemeta allocating indirect block: shouldn't happen\n");
|
||||
printf ("Updatemeta allocating indirect block: shouldn't happen\n");
|
||||
ip->i_blocks += btodb(fs->lfs_bsize);
|
||||
fs->lfs_bfree -= btodb(fs->lfs_bsize);
|
||||
}
|
||||
@ -618,7 +618,7 @@ kprintf ("Updatemeta allocating indirect block: shouldn't happen\n");
|
||||
#ifdef DIAGNOSTIC
|
||||
if (sup->su_nbytes < fs->lfs_bsize) {
|
||||
/* XXX -- Change to a panic. */
|
||||
kprintf("lfs: negative bytes (segment %d)\n",
|
||||
printf("lfs: negative bytes (segment %d)\n",
|
||||
datosn(fs, daddr));
|
||||
panic ("Negative Bytes");
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: lfs_subr.c,v 1.4 1996/10/10 17:21:27 christos Exp $ */
|
||||
/* $NetBSD: lfs_subr.c,v 1.5 1996/10/12 21:58:52 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1991, 1993
|
||||
@ -152,7 +152,7 @@ lfs_segunlock(fs)
|
||||
free((*sp->bpp)->b_data, M_SEGMENT);
|
||||
free(*sp->bpp, M_SEGMENT);
|
||||
} else
|
||||
kprintf ("unlock to 0 with no summary");
|
||||
printf ("unlock to 0 with no summary");
|
||||
free(sp->bpp, M_SEGMENT);
|
||||
free(sp, M_SEGMENT);
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: lfs_syscalls.c,v 1.11 1996/10/10 17:21:29 christos Exp $ */
|
||||
/* $NetBSD: lfs_syscalls.c,v 1.12 1996/10/12 21:58:53 christos Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1991, 1993, 1994
|
||||
@ -177,7 +177,7 @@ lfs_markv(p, v, retval)
|
||||
blkp->bi_lbn == LFS_UNUSED_LBN ?
|
||||
blkp->bi_bp : NULL)) {
|
||||
#ifdef DIAGNOSTIC
|
||||
kprintf("lfs_markv: VFS_VGET failed (%d)\n",
|
||||
printf("lfs_markv: VFS_VGET failed (%d)\n",
|
||||
blkp->bi_inode);
|
||||
#endif
|
||||
lastino = LFS_UNUSED_INUM;
|
||||
@ -472,10 +472,10 @@ lfs_fastvget(mp, ino, daddr, vpp, dinp)
|
||||
if ((*vpp = ufs_ihashlookup(dev, ino)) != NULL) {
|
||||
lfs_vref(*vpp);
|
||||
if ((*vpp)->v_flag & VXLOCK)
|
||||
kprintf ("Cleaned vnode VXLOCKED\n");
|
||||
printf ("Cleaned vnode VXLOCKED\n");
|
||||
ip = VTOI(*vpp);
|
||||
if (ip->i_flag & IN_LOCKED)
|
||||
kprintf("cleaned vnode locked\n");
|
||||
printf("cleaned vnode locked\n");
|
||||
if (!(ip->i_flag & IN_MODIFIED)) {
|
||||
++ump->um_lfs->lfs_uinodes;
|
||||
ip->i_flag |= IN_MODIFIED;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: mfs_vnops.c,v 1.11 1996/10/10 17:21:31 christos Exp $ */
|
||||
/* $NetBSD: mfs_vnops.c,v 1.12 1996/10/12 21:58:54 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1989, 1993
|
||||
@ -273,7 +273,7 @@ mfs_close(v)
|
||||
* vnode, so if we find any other uses, it is a panic.
|
||||
*/
|
||||
if (vp->v_usecount > 1)
|
||||
kprintf("mfs_close: ref count %d > 1\n", vp->v_usecount);
|
||||
printf("mfs_close: ref count %d > 1\n", vp->v_usecount);
|
||||
if (vp->v_usecount > 1 || mfsp->mfs_buflist)
|
||||
panic("mfs_close");
|
||||
/*
|
||||
@ -332,7 +332,7 @@ mfs_print(v)
|
||||
} */ *ap = v;
|
||||
register struct mfsnode *mfsp = VTOMFS(ap->a_vp);
|
||||
|
||||
kprintf("tag VT_MFS, pid %d, base %p, size %ld\n", mfsp->mfs_pid,
|
||||
printf("tag VT_MFS, pid %d, base %p, size %ld\n", mfsp->mfs_pid,
|
||||
mfsp->mfs_baseoff, mfsp->mfs_size);
|
||||
return (0);
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: ufs_lookup.c,v 1.8 1996/10/10 17:21:33 christos Exp $ */
|
||||
/* $NetBSD: ufs_lookup.c,v 1.9 1996/10/12 21:58:56 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1989, 1993
|
||||
@ -616,7 +616,7 @@ ufs_dirbad(ip, offset, how)
|
||||
struct mount *mp;
|
||||
|
||||
mp = ITOV(ip)->v_mount;
|
||||
kprintf("%s: bad dir ino %d at offset %d: %s\n",
|
||||
printf("%s: bad dir ino %d at offset %d: %s\n",
|
||||
mp->mnt_stat.f_mntonname, ip->i_number, offset, how);
|
||||
if ((mp->mnt_stat.f_flags & MNT_RDONLY) == 0)
|
||||
panic("bad dir");
|
||||
@ -651,7 +651,7 @@ ufs_dirbadentry(dp, ep, entryoffsetinblock)
|
||||
ep->d_reclen > DIRBLKSIZ - (entryoffsetinblock & (DIRBLKSIZ - 1)) ||
|
||||
ep->d_reclen < DIRSIZ(FSFMT(dp), ep) || namlen > MAXNAMLEN) {
|
||||
/*return (1); */
|
||||
kprintf("First bad\n");
|
||||
printf("First bad\n");
|
||||
goto bad;
|
||||
}
|
||||
if (ep->d_ino == 0)
|
||||
@ -659,7 +659,7 @@ ufs_dirbadentry(dp, ep, entryoffsetinblock)
|
||||
for (i = 0; i < namlen; i++)
|
||||
if (ep->d_name[i] == '\0') {
|
||||
/*return (1); */
|
||||
kprintf("Second bad\n");
|
||||
printf("Second bad\n");
|
||||
goto bad;
|
||||
}
|
||||
if (ep->d_name[i])
|
||||
@ -1054,7 +1054,7 @@ ufs_checkpath(source, target, cred)
|
||||
|
||||
out:
|
||||
if (error == ENOTDIR)
|
||||
kprintf("checkpath: .. not a directory\n");
|
||||
printf("checkpath: .. not a directory\n");
|
||||
if (vp != NULL)
|
||||
vput(vp);
|
||||
return (error);
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: ufs_vnops.c,v 1.20 1996/10/10 17:21:36 christos Exp $ */
|
||||
/* $NetBSD: ufs_vnops.c,v 1.21 1996/10/12 21:58:58 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1982, 1986, 1989, 1993
|
||||
@ -1541,7 +1541,7 @@ start:
|
||||
if (ip->i_lockholder != 0)
|
||||
panic("lockholder (%d) != 0", ip->i_lockholder);
|
||||
if (p && p->p_pid == 0)
|
||||
kprintf("locking by process 0\n");
|
||||
printf("locking by process 0\n");
|
||||
if (p)
|
||||
ip->i_lockholder = p->p_pid;
|
||||
else
|
||||
@ -1656,19 +1656,19 @@ ufs_print(v)
|
||||
register struct vnode *vp = ap->a_vp;
|
||||
register struct inode *ip = VTOI(vp);
|
||||
|
||||
kprintf("tag VT_UFS, ino %d, on dev %d, %d", ip->i_number,
|
||||
printf("tag VT_UFS, ino %d, on dev %d, %d", ip->i_number,
|
||||
major(ip->i_dev), minor(ip->i_dev));
|
||||
#ifdef FIFO
|
||||
if (vp->v_type == VFIFO)
|
||||
fifo_printinfo(vp);
|
||||
#endif /* FIFO */
|
||||
kprintf("%s\n", (ip->i_flag & IN_LOCKED) ? " (LOCKED)" : "");
|
||||
printf("%s\n", (ip->i_flag & IN_LOCKED) ? " (LOCKED)" : "");
|
||||
if (ip->i_lockholder == 0)
|
||||
return (0);
|
||||
kprintf("\towner pid %d", ip->i_lockholder);
|
||||
printf("\towner pid %d", ip->i_lockholder);
|
||||
if (ip->i_lockwaiter)
|
||||
kprintf(" waiting pid %d", ip->i_lockwaiter);
|
||||
kprintf("\n");
|
||||
printf(" waiting pid %d", ip->i_lockwaiter);
|
||||
printf("\n");
|
||||
return (0);
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user