diff options
| author | Bruce Evans <bde@FreeBSD.org> | 1999-08-29 10:03:35 +0000 |
|---|---|---|
| committer | Bruce Evans <bde@FreeBSD.org> | 1999-08-29 10:03:35 +0000 |
| commit | 8021ba879a37f3f9e969e574c0f02edf0b36f7b0 (patch) | |
| tree | 9eea3842169edc1b428ccc571219b82b944ca841 /sys/fs | |
| parent | b00b6d73dd82e21db6f4c4270a381aa0c6cb47cc (diff) | |
Notes
Diffstat (limited to 'sys/fs')
| -rw-r--r-- | sys/fs/unionfs/union_subr.c | 4 | ||||
| -rw-r--r-- | sys/fs/unionfs/union_vfsops.c | 19 |
2 files changed, 11 insertions, 12 deletions
diff --git a/sys/fs/unionfs/union_subr.c b/sys/fs/unionfs/union_subr.c index 6334810ae622..ed09a65fbb4a 100644 --- a/sys/fs/unionfs/union_subr.c +++ b/sys/fs/unionfs/union_subr.c @@ -253,7 +253,7 @@ union_newsize(vp, uppersz, lowersz) } if (sz != VNOVAL) { -#ifdef UNION_DIAGNOSTIC +#ifdef DEBUG printf("union: %s size now %ld\n", uppersz != VNOVAL ? "upper" : "lower", (long) sz); #endif @@ -694,7 +694,7 @@ union_copyup(un, docopy, cred, p) VOP_UNLOCK(lvp, 0, p); (void) VOP_CLOSE(lvp, FREAD, cred, p); } -#ifdef UNION_DIAGNOSTIC +#ifdef DEBUG if (error == 0) uprintf("union: copied up %s\n", un->un_path); #endif diff --git a/sys/fs/unionfs/union_vfsops.c b/sys/fs/unionfs/union_vfsops.c index a02fb9a71f8f..888ad3086445 100644 --- a/sys/fs/unionfs/union_vfsops.c +++ b/sys/fs/unionfs/union_vfsops.c @@ -97,8 +97,8 @@ union_mount(mp, path, data, ndp, p) int len; u_int size; -#ifdef UNION_DIAGNOSTIC - printf("union_mount(mp = %x)\n", mp); +#ifdef DEBUG + printf("union_mount(mp = %p)\n", (void *)mp); #endif /* @@ -270,7 +270,7 @@ union_mount(mp, path, data, ndp, p) (void)union_statfs(mp, &mp->mnt_stat, p); -#ifdef UNION_DIAGNOSTIC +#ifdef DEBUG printf("union_mount: from %s, on %s\n", mp->mnt_stat.f_mntfromname, mp->mnt_stat.f_mntonname); #endif @@ -318,8 +318,8 @@ union_unmount(mp, mntflags, p) int freeing; int flags = 0; -#ifdef UNION_DIAGNOSTIC - printf("union_unmount(mp = %x)\n", mp); +#ifdef DEBUG + printf("union_unmount(mp = %p)\n", (void *)mp); #endif if (mntflags & MNT_FORCE) @@ -361,7 +361,7 @@ union_unmount(mp, mntflags, p) return (EBUSY); } -#ifdef UNION_DIAGNOSTIC +#ifdef DEBUG vprint("union root", um_rootvp); #endif /* @@ -456,10 +456,9 @@ union_statfs(mp, sbp, p) struct statfs mstat; int lbsize; -#ifdef UNION_DIAGNOSTIC - printf("union_statfs(mp = %x, lvp = %x, uvp = %x)\n", mp, - um->um_lowervp, - um->um_uppervp); +#ifdef DEBUG + printf("union_statfs(mp = %p, lvp = %p, uvp = %p)\n", + (void *)mp, (void *)um->um_lowervp, (void *)um->um_uppervp); #endif bzero(&mstat, sizeof(mstat)); |