summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/msdosfs/msdosfs_denode.c12
-rw-r--r--sys/msdosfs/msdosfs_fat.c14
-rw-r--r--sys/msdosfs/msdosfs_lookup.c14
-rw-r--r--sys/msdosfs/msdosfs_vfsops.c33
-rw-r--r--sys/msdosfs/msdosfs_vnops.c18
5 files changed, 49 insertions, 42 deletions
diff --git a/sys/msdosfs/msdosfs_denode.c b/sys/msdosfs/msdosfs_denode.c
index 9cb3f489801..a686f35cee8 100644
--- a/sys/msdosfs/msdosfs_denode.c
+++ b/sys/msdosfs/msdosfs_denode.c
@@ -1,4 +1,4 @@
-/* $NetBSD: msdosfs_denode.c,v 1.23 1997/10/17 11:23:58 ws Exp $ */
+/* $NetBSD: msdosfs_denode.c,v 1.24 1997/11/16 21:47:27 christos Exp $ */
/*-
* Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -167,7 +167,7 @@ deget(pmp, dirclust, diroffset, depp)
struct buf *bp;
#ifdef MSDOSFS_DEBUG
- printf("deget(pmp %08x, dirclust %d, diroffset %x, depp %08x)\n",
+ printf("deget(pmp %p, dirclust %ld, diroffset %lx, depp %p)\n",
pmp, dirclust, diroffset, depp);
#endif
@@ -430,7 +430,7 @@ detrunc(dep, length, flags, cred, p)
vinvalbuf(DETOV(dep), vflags, cred, p, 0, 0);
allerror = deupdat(dep, 1);
#ifdef MSDOSFS_DEBUG
- printf("detrunc(): allerror %d, eofentry %d\n",
+ printf("detrunc(): allerror %d, eofentry %ld\n",
allerror, eofentry);
#endif
@@ -543,7 +543,7 @@ msdosfs_reclaim(v)
extern int prtactive;
#ifdef MSDOSFS_DEBUG
- printf("msdosfs_reclaim(): dep %08x, file %s, refcnt %d\n",
+ printf("msdosfs_reclaim(): dep %p, file %s, refcnt %ld\n",
dep, dep->de_Name, dep->de_refcnt);
#endif
@@ -582,7 +582,7 @@ msdosfs_inactive(v)
extern int prtactive;
#ifdef MSDOSFS_DEBUG
- printf("msdosfs_inactive(): dep %08x, de_Name[0] %x\n", dep, dep->de_Name[0]);
+ printf("msdosfs_inactive(): dep %p, de_Name[0] %x\n", dep, dep->de_Name[0]);
#endif
if (prtactive && vp->v_usecount != 0)
@@ -613,7 +613,7 @@ msdosfs_inactive(v)
* as empty. (This may not be necessary for the dos filesystem.)
*/
#ifdef MSDOSFS_DEBUG
- printf("msdosfs_inactive(): dep %08x, refcnt %d, mntflag %x, MNT_RDONLY %x\n",
+ printf("msdosfs_inactive(): dep %p, refcnt %ld, mntflag %x, MNT_RDONLY %x\n",
dep, dep->de_refcnt, vp->v_mount->mnt_flag, MNT_RDONLY);
#endif
if (dep->de_refcnt <= 0 && (vp->v_mount->mnt_flag & MNT_RDONLY) == 0) {
diff --git a/sys/msdosfs/msdosfs_fat.c b/sys/msdosfs/msdosfs_fat.c
index 3250037e8d0..0eae3c57821 100644
--- a/sys/msdosfs/msdosfs_fat.c
+++ b/sys/msdosfs/msdosfs_fat.c
@@ -1,4 +1,4 @@
-/* $NetBSD: msdosfs_fat.c,v 1.26 1997/10/17 11:24:02 ws Exp $ */
+/* $NetBSD: msdosfs_fat.c,v 1.27 1997/11/16 21:47:29 christos Exp $ */
/*-
* Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -336,7 +336,7 @@ updatefats(pmp, bp, fatbn)
struct buf *bpn;
#ifdef MSDOSFS_DEBUG
- printf("updatefats(pmp %08x, bp %08x, fatbn %d)\n",
+ printf("updatefats(pmp %p, bp %p, fatbn %ld)\n",
pmp, bp, fatbn);
#endif
@@ -510,8 +510,8 @@ fatentry(function, pmp, cn, oldcontents, newcontents)
struct buf *bp;
#ifdef MSDOSFS_DEBUG
- printf("fatentry(func %d, pmp %08x, clust %d, oldcon %08x, newcon %d)\n",
- function, pmp, cluster, oldcontents, newcontents);
+ printf("fatentry(func %d, pmp %p, clust %ld, oldcon %p, newcon %ld)\n",
+ function, pmp, cn, oldcontents, newcontents);
#endif
#ifdef DIAGNOSTIC
@@ -615,7 +615,7 @@ fatchain(pmp, start, count, fillwith)
struct buf *bp;
#ifdef MSDOSFS_DEBUG
- printf("fatchain(pmp %08x, start %d, count %d, fillwith %d)\n",
+ printf("fatchain(pmp %p, start %ld, count %ld, fillwith %ld)\n",
pmp, start, count, fillwith);
#endif
/*
@@ -740,7 +740,7 @@ chainalloc(pmp, start, count, fillwith, retcluster, got)
if ((error = fatchain(pmp, start, count, fillwith)) != 0)
return (error);
#ifdef MSDOSFS_DEBUG
- printf("clusteralloc(): allocated cluster chain at %d (%d clusters)\n",
+ printf("clusteralloc(): allocated cluster chain at %ld (%ld clusters)\n",
start, count);
#endif
if (retcluster)
@@ -776,7 +776,7 @@ clusteralloc(pmp, start, count, fillwith, retcluster, got)
u_int map;
#ifdef MSDOSFS_DEBUG
- printf("clusteralloc(): find %d clusters\n",count);
+ printf("clusteralloc(): find %ld clusters\n",count);
#endif
if (start) {
if ((len = chainlength(pmp, start, count)) >= count)
diff --git a/sys/msdosfs/msdosfs_lookup.c b/sys/msdosfs/msdosfs_lookup.c
index 1f256086804..5d4d3fefc42 100644
--- a/sys/msdosfs/msdosfs_lookup.c
+++ b/sys/msdosfs/msdosfs_lookup.c
@@ -1,4 +1,4 @@
-/* $NetBSD: msdosfs_lookup.c,v 1.35 1997/11/08 19:18:57 ws Exp $ */
+/* $NetBSD: msdosfs_lookup.c,v 1.36 1997/11/16 21:47:32 christos Exp $ */
/*-
* Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -123,7 +123,7 @@ msdosfs_lookup(v)
lockparent = flags & LOCKPARENT;
wantparent = flags & (LOCKPARENT | WANTPARENT);
#ifdef MSDOSFS_DEBUG
- printf("msdosfs_lookup(): vdp %08x, dp %08x, Attr %02x\n",
+ printf("msdosfs_lookup(): vdp %p, dp %p, Attr %02x\n",
vdp, dp, dp->de_Attributes);
#endif
@@ -174,7 +174,7 @@ msdosfs_lookup(v)
if (!error) {
if (vpid == vdp->v_id) {
#ifdef MSDOSFS_DEBUG
- printf("msdosfs_lookup(): cache hit, vnode %08x, file %s\n",
+ printf("msdosfs_lookup(): cache hit, vnode %p, file %s\n",
vdp, dp->de_Name);
#endif
return (0);
@@ -239,7 +239,7 @@ msdosfs_lookup(v)
slotcount = 0;
#ifdef MSDOSFS_DEBUG
- printf("msdosfs_lookup(): dos version of filename %s, length %d\n",
+ printf("msdosfs_lookup(): dos version of filename %s, length %ld\n",
dosfilename, cnp->cn_namelen);
#endif
/*
@@ -378,7 +378,7 @@ notfound:;
* the pathname and the directory hasn't been removed.
*/
#ifdef MSDOSFS_DEBUG
- printf("msdosfs_lookup(): op %d, refcnt %d\n",
+ printf("msdosfs_lookup(): op %d, refcnt %ld\n",
nameiop, dp->de_refcnt);
printf(" slotcount %d, slotoffset %d\n",
slotcount, slotoffset);
@@ -610,7 +610,7 @@ createde(dep, ddep, depp, cnp)
int blsize;
#ifdef MSDOSFS_DEBUG
- printf("createde(dep %08x, ddep %08x, depp %08x, cnp %08x)\n",
+ printf("createde(dep %p, ddep %p, depp %p, cnp %p)\n",
dep, ddep, depp, cnp);
#endif
@@ -953,7 +953,7 @@ removede(pdep, dep)
u_long offset = pdep->de_fndoffset;
#ifdef MSDOSFS_DEBUG
- printf("removede(): filename %s, dep %08x, offset %08x\n",
+ printf("removede(): filename %s, dep %p, offset %08lx\n",
dep->de_Name, dep, offset);
#endif
diff --git a/sys/msdosfs/msdosfs_vfsops.c b/sys/msdosfs/msdosfs_vfsops.c
index 7a1f0c4a25e..b467ddf4514 100644
--- a/sys/msdosfs/msdosfs_vfsops.c
+++ b/sys/msdosfs/msdosfs_vfsops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: msdosfs_vfsops.c,v 1.48 1997/10/18 02:54:57 briggs Exp $ */
+/* $NetBSD: msdosfs_vfsops.c,v 1.49 1997/11/16 21:47:34 christos Exp $ */
/*-
* Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -345,7 +345,7 @@ msdosfs_mount(mp, path, data, ndp, p)
&size);
bzero(mp->mnt_stat.f_mntfromname + size, MNAMELEN - size);
#ifdef MSDOSFS_DEBUG
- printf("msdosfs_mount(): mp %x, pmp %x, inusemap %x\n", mp, pmp, pmp->pm_inusemap);
+ printf("msdosfs_mount(): mp %p, pmp %p, inusemap %p\n", mp, pmp, pmp->pm_inusemap);
#endif
return (0);
}
@@ -747,16 +747,23 @@ msdosfs_unmount(mp, mntflags, p)
pmp->pm_devvp->v_specflags &= ~SI_MOUNTEDON;
#ifdef MSDOSFS_DEBUG
printf("msdosfs_umount(): just before calling VOP_CLOSE()\n");
- printf("flag %08x, usecount %d, writecount %d, holdcnt %d\n",
- vp->v_flag, vp->v_usecount, vp->v_writecount, vp->v_holdcnt);
- printf("lastr %d, id %d, mount %08x, op %08x\n",
- vp->v_lastr, vp->v_id, vp->v_mount, vp->v_op);
- printf("freef %08x, freeb %08x, mountf %08x, mountb %08x\n",
- vp->v_freef, vp->v_freeb, vp->v_mountf, vp->v_mountb);
- printf("cleanblkhd %08x, dirtyblkhd %08x, numoutput %d, type %d\n",
- vp->v_cleanblkhd, vp->v_dirtyblkhd, vp->v_numoutput, vp->v_type);
- printf("union %08x, tag %d, data[0] %08x, data[1] %08x\n",
- vp->v_socket, vp->v_tag, vp->v_data[0], vp->v_data[1]);
+ printf("flag %08lx, usecount %d, writecount %d, holdcnt %ld\n",
+ pmp->pm_devvp->v_flag, pmp->pm_devvp->v_usecount,
+ pmp->pm_devvp->v_writecount, pmp->pm_devvp->v_holdcnt);
+ printf("lastr %d, id %ld, mount %p, op %p\n",
+ pmp->pm_devvp->v_lastr, pmp->pm_devvp->v_id,
+ pmp->pm_devvp->v_mount, pmp->pm_devvp->v_op);
+/* printf("freef %08x, freeb %08x, mountf %08x, mountb %08x\n",
+ pmp->pm_devvp->v_freef, pmp->pm_devvp->v_freeb,
+ pmp->pm_devvp->v_mountf, pmp->pm_devvp->v_mountb); */
+ printf("cleanblkhd %p, dirtyblkhd %p, numoutput %ld, type %d\n",
+ pmp->pm_devvp->v_cleanblkhd.lh_first,
+ pmp->pm_devvp->v_dirtyblkhd.lh_first,
+ pmp->pm_devvp->v_numoutput, pmp->pm_devvp->v_type);
+ printf("union %p, tag %d, data[0] %08x, data[1] %08x\n",
+ pmp->pm_devvp->v_socket, pmp->pm_devvp->v_tag,
+ ((unsigned int*)pmp->pm_devvp->v_data)[0],
+ ((unsigned int*)pmp->pm_devvp->v_data)[1] );
#endif
error = VOP_CLOSE(pmp->pm_devvp,
pmp->pm_flags & MSDOSFSMNT_RONLY ? FREAD : FREAD|FWRITE, NOCRED, p);
@@ -778,7 +785,7 @@ msdosfs_root(mp, vpp)
int error;
#ifdef MSDOSFS_DEBUG
- printf("msdosfs_root(); mp %08x, pmp %08x, ndep %08x, vp %08x\n",
+ printf("msdosfs_root(); mp %p, pmp %p, ndep %p, vp %p\n",
mp, pmp, ndep, DETOV(ndep));
#endif
if ((error = deget(pmp, MSDOSFSROOT, MSDOSFSROOT_OFS, &ndep)) != 0)
diff --git a/sys/msdosfs/msdosfs_vnops.c b/sys/msdosfs/msdosfs_vnops.c
index f3d51d8e999..97cdffe71d2 100644
--- a/sys/msdosfs/msdosfs_vnops.c
+++ b/sys/msdosfs/msdosfs_vnops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: msdosfs_vnops.c,v 1.64 1997/11/08 19:18:58 ws Exp $ */
+/* $NetBSD: msdosfs_vnops.c,v 1.65 1997/11/16 21:47:38 christos Exp $ */
/*-
* Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -116,7 +116,7 @@ msdosfs_create(v)
struct timespec ts;
#ifdef MSDOSFS_DEBUG
- printf("msdosfs_create(cnp %08x, vap %08x\n", cnp, ap->a_vap);
+ printf("msdosfs_create(cnp %p, vap %p\n", cnp, ap->a_vap);
#endif
/*
@@ -338,7 +338,7 @@ msdosfs_setattr(v)
struct ucred *cred = ap->a_cred;
#ifdef MSDOSFS_DEBUG
- printf("msdosfs_setattr(): vp %08x, vap %08x, cred %08x, p %08x\n",
+ printf("msdosfs_setattr(): vp %p, vap %p, cred %p, p %p\n",
ap->a_vp, vap, cred, ap->a_p);
#endif
if ((vap->va_type != VNON) || (vap->va_nlink != (nlink_t)VNOVAL) ||
@@ -348,9 +348,9 @@ msdosfs_setattr(v)
(vap->va_uid != VNOVAL) || (vap->va_gid != VNOVAL)) {
#ifdef MSDOSFS_DEBUG
printf("msdosfs_setattr(): returning EINVAL\n");
- printf(" va_type %d, va_nlink %x, va_fsid %x, va_fileid %x\n",
+ printf(" va_type %d, va_nlink %x, va_fsid %lx, va_fileid %lx\n",
vap->va_type, vap->va_nlink, vap->va_fsid, vap->va_fileid);
- printf(" va_blocksize %x, va_rdev %x, va_bytes %x, va_gen %x\n",
+ printf(" va_blocksize %lx, va_rdev %x, va_bytes %qx, va_gen %lx\n",
vap->va_blocksize, vap->va_rdev, vap->va_bytes, vap->va_gen);
printf(" va_uid %x, va_gid %x\n",
vap->va_uid, vap->va_gid);
@@ -525,9 +525,9 @@ msdosfs_write(v)
struct ucred *cred = ap->a_cred;
#ifdef MSDOSFS_DEBUG
- printf("msdosfs_write(vp %08x, uio %08x, ioflag %08x, cred %08x\n",
+ printf("msdosfs_write(vp %p, uio %p, ioflag %08x, cred %p\n",
vp, uio, ioflag, cred);
- printf("msdosfs_write(): diroff %d, dirclust %d, startcluster %d\n",
+ printf("msdosfs_write(): diroff %ld, dirclust %ld, startcluster %ld\n",
dep->de_diroffset, dep->de_dirclust, dep->de_StartCluster);
#endif
@@ -787,7 +787,7 @@ msdosfs_remove(v)
else
error = removede(ddep, dep);
#ifdef MSDOSFS_DEBUG
- printf("msdosfs_remove(), dep %08x, v_usecount %d\n", dep, ap->a_vp->v_usecount);
+ printf("msdosfs_remove(), dep %p, v_usecount %d\n", dep, ap->a_vp->v_usecount);
#endif
if (ddep == dep)
vrele(ap->a_vp);
@@ -1444,7 +1444,7 @@ msdosfs_readdir(v)
int chksum = -1;
#ifdef MSDOSFS_DEBUG
- printf("msdosfs_readdir(): vp %08x, uio %08x, cred %08x, eofflagp %08x\n",
+ printf("msdosfs_readdir(): vp %p, uio %p, cred %p, eofflagp %p\n",
ap->a_vp, uio, ap->a_cred, ap->a_eofflag);
#endif