diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 1997-09-11 05:26:17 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 1997-09-11 05:26:17 +0000 |
| commit | d61245b77adf04a2a9bfcf74bae9ad780d1045da (patch) | |
| tree | 1139ad7257b61c4fa2523bf9e1199dc887f0d6c7 /sys/miscfs/nullfs/null_subr.c | |
| parent | 2cf14d3e5293a5d7893d2a5c0d3b3a827c467c51 (diff) | |
Fix {KERNFS,NULLFS,UMAPFS,UNION}_DIAGNOSTIC kernel compilation errors.
From Alan Barrett <apb@iafrica.com> with some changes.
Diffstat (limited to 'sys/miscfs/nullfs/null_subr.c')
| -rw-r--r-- | sys/miscfs/nullfs/null_subr.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/sys/miscfs/nullfs/null_subr.c b/sys/miscfs/nullfs/null_subr.c index ceb0b3e3c38..8c77df2348d 100644 --- a/sys/miscfs/nullfs/null_subr.c +++ b/sys/miscfs/nullfs/null_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: null_subr.c,v 1.3 1996/05/22 12:04:35 deraadt Exp $ */ +/* $OpenBSD: null_subr.c,v 1.4 1997/09/11 05:26:12 millert Exp $ */ /* $NetBSD: null_subr.c,v 1.6 1996/05/10 22:50:52 jtk Exp $ */ /* @@ -303,8 +303,8 @@ null_node_create(mp, lowervp, newvpp, takelock) return (0); } -#ifdef notyet #ifdef NULLFS_DIAGNOSTIC +int null_checkvp_barrier = 1; struct vnode * null_checkvp(vp, fil, lno) struct vnode *vp; @@ -326,9 +326,9 @@ null_checkvp(vp, fil, lno) if (a->null_lowervp == NULL) { /* Should never happen */ int i; u_long *p; - printf("vp = %x, ZERO ptr\n", vp); + printf("vp = %p, ZERO ptr\n", vp); for (p = (u_long *) a, i = 0; i < 8; i++) - printf(" %x", p[i]); + printf(" %lx", p[i]); printf("\n"); /* wait for debugger */ while (null_checkvp_barrier) /*WAIT*/ ; @@ -336,16 +336,16 @@ null_checkvp(vp, fil, lno) } if (a->null_lowervp->v_usecount < 1) { int i; u_long *p; - printf("vp = %x, unref'ed lowervp\n", vp); + printf("vp = %p, unref'ed lowervp\n", vp); for (p = (u_long *) a, i = 0; i < 8; i++) - printf(" %x", p[i]); + printf(" %lx", p[i]); printf("\n"); /* wait for debugger */ while (null_checkvp_barrier) /*WAIT*/ ; panic ("null with unref'ed lowervp"); }; #ifdef notyet - printf("null %x/%d -> %x/%d [%s, %d]\n", + printf("null %p/%d -> %p/%d [%s, %d]\n", NULLTOV(a), NULLTOV(a)->v_usecount, a->null_lowervp, a->null_lowervp->v_usecount, fil, lno); @@ -353,4 +353,3 @@ null_checkvp(vp, fil, lno) return a->null_lowervp; } #endif -#endif |