45c45
< __FBSDID("$FreeBSD: head/sys/fs/coda/coda_vnops.c 118047 2003-07-26 07:32:23Z phk $");
---
> __FBSDID("$FreeBSD: head/sys/fs/coda/coda_vnops.c 119832 2003-09-07 07:43:10Z tjr $");
492,495c492,493
< CODADEBUG(CODA_RDWR, myprintf(("indirect rdwr: fid = (%lx.%lx.%lx), refcnt = %d\n",
< cp->c_fid.Volume, cp->c_fid.Vnode,
< cp->c_fid.Unique, vrefcnt(CTOV(cp)))); )
<
---
> CODADEBUG(CODA_RDWR, myprintf(("indirect rdwr: fid = %s, refcnt = %d\n",
> coda_f2s(&cp->c_fid), CTOV(cp)->v_usecount)); )
642,645c640,641
< CODADEBUG(CODA_GETATTR, { myprintf(("attr cache hit: (%lx.%lx.%lx)\n",
< cp->c_fid.Volume,
< cp->c_fid.Vnode,
< cp->c_fid.Unique));});
---
> CODADEBUG(CODA_GETATTR, { myprintf(("attr cache hit: %s\n",
> coda_f2s(&cp->c_fid)));});
657,661c653,654
< CODADEBUG(CODA_GETATTR, myprintf(("getattr miss (%lx.%lx.%lx): result %d\n",
< cp->c_fid.Volume,
< cp->c_fid.Vnode,
< cp->c_fid.Unique,
< error)); )
---
> CODADEBUG(CODA_GETATTR, myprintf(("getattr miss %s: result %d\n",
> coda_f2s(&cp->c_fid), error)); )
908,911c901,903
< CODADEBUG(CODA_INACTIVE, myprintf(("in inactive, %lx.%lx.%lx. vfsp %p\n",
< cp->c_fid.Volume, cp->c_fid.Vnode,
< cp->c_fid.Unique, vp->v_mount));)
<
---
> CODADEBUG(CODA_INACTIVE, myprintf(("in inactive, %s, vfsp %p\n",
> coda_f2s(&cp->c_fid), vp->v_mount));)
>
983c975
< ViceFid VFid;
---
> CodaFid VFid;
989,991c981,982
< CODADEBUG(CODA_LOOKUP, myprintf(("lookup: %s in %lx.%lx.%lx\n",
< nm, dcp->c_fid.Volume,
< dcp->c_fid.Vnode, dcp->c_fid.Unique)););
---
> CODADEBUG(CODA_LOOKUP, myprintf(("lookup: %s in %s\n",
> nm, coda_f2s(&dcp->c_fid))););
1003,1005c994,996
< CODADEBUG(CODA_LOOKUP, myprintf(("name too long: lookup, %lx.%lx.%lx(%s)\n",
< dcp->c_fid.Volume, dcp->c_fid.Vnode,
< dcp->c_fid.Unique, nm)););
---
>
> CODADEBUG(CODA_LOOKUP, myprintf(("name too long: lookup, %s (%s)\n",
> coda_f2s(&dcp->c_fid), nm)););
1025,1026c1016,1018
< CODADEBUG(CODA_LOOKUP, myprintf(("lookup error on %lx.%lx.%lx(%s)%d\n",
< dcp->c_fid.Volume, dcp->c_fid.Vnode, dcp->c_fid.Unique, nm, error));)
---
>
> CODADEBUG(CODA_LOOKUP, myprintf(("lookup error on %s (%s)%d\n",
> coda_f2s(&dcp->c_fid), nm, error));)
1031,1034c1023,1024
< myprintf(("lookup: vol %lx vno %lx uni %lx type %o result %d\n",
< VFid.Volume, VFid.Vnode, VFid.Unique, vtype,
< error)); )
<
---
> myprintf(("lookup: %s type %o result %d\n",
> coda_f2s(&VFid), vtype, error)); )
1144c1134
< ViceFid VFid;
---
> CodaFid VFid;
1189,1190c1179,1180
< myprintf(("create: (%lx.%lx.%lx), result %d\n",
< VFid.Volume, VFid.Vnode, VFid.Unique, error)); )
---
> myprintf(("create: %s, result %d\n",
> coda_f2s(&VFid), error)); )
1231,1234c1221,1222
< CODADEBUG(CODA_REMOVE, myprintf(("remove: %s in %lx.%lx.%lx\n",
< nm, cp->c_fid.Volume, cp->c_fid.Vnode,
< cp->c_fid.Unique)););
<
---
> CODADEBUG(CODA_REMOVE, myprintf(("remove: %s in %s\n",
> nm, coda_f2s(&cp->c_fid))););
1293,1298c1281,1284
<
< myprintf(("nb_link: vp fid: (%lx.%lx.%lx)\n",
< cp->c_fid.Volume, cp->c_fid.Vnode, cp->c_fid.Unique));
< myprintf(("nb_link: tdvp fid: (%lx.%lx.%lx)\n",
< tdcp->c_fid.Volume, tdcp->c_fid.Vnode, tdcp->c_fid.Unique));
<
---
> myprintf(("nb_link: vp fid: %s\n",
> coda_f2s(&cp->c_fid)));
> myprintf(("nb_link: tdvp fid: %s)\n",
> coda_f2s(&tdcp->c_fid)));
1301,1305c1287,1290
< myprintf(("link: vp fid: (%lx.%lx.%lx)\n",
< cp->c_fid.Volume, cp->c_fid.Vnode, cp->c_fid.Unique));
< myprintf(("link: tdvp fid: (%lx.%lx.%lx)\n",
< tdcp->c_fid.Volume, tdcp->c_fid.Vnode, tdcp->c_fid.Unique));
<
---
> myprintf(("link: vp fid: %s\n",
> coda_f2s(&cp->c_fid)));
> myprintf(("link: tdvp fid: %s\n",
> coda_f2s(&tdcp->c_fid)));
1438c1423
< ViceFid VFid;
---
> CodaFid VFid;
1481,1483c1466,1468
< CODADEBUG( CODA_MKDIR, myprintf(("mkdir: (%lx.%lx.%lx) result %d\n",
< VFid.Volume, VFid.Vnode, VFid.Unique, error)); )
< } else {
---
> CODADEBUG( CODA_MKDIR, myprintf(("mkdir: %s result %d\n",
> coda_f2s(&VFid), error)); )
> } else {
1666c1651
< CODADEBUG(CODA_READDIR, myprintf(("indirect readdir: fid = (%lx.%lx.%lx), refcnt = %d\n",cp->c_fid.Volume, cp->c_fid.Vnode, cp->c_fid.Unique, vrefcnt(vp))); )
---
> CODADEBUG(CODA_READDIR, myprintf(("indirect readdir: fid = %s, refcnt = %d\n", coda_f2s(&cp->c_fid), vp->v_usecount)); )
1777,1778c1762,1763
< myprintf(("Attempting lock on %lx.%lx.%lx\n",
< cp->c_fid.Volume, cp->c_fid.Vnode, cp->c_fid.Unique));
---
> myprintf(("Attempting lock on %s\n",
> coda_f2s(&cp->c_fid)));
1803,1804c1788,1789
< myprintf(("Attempting unlock on %lx.%lx.%lx\n",
< cp->c_fid.Volume, cp->c_fid.Vnode, cp->c_fid.Unique));
---
> myprintf(("Attempting unlock on %s\n",
> coda_f2s(&cp->c_fid)));
1923c1908
< * in a table hashed by fid.Volume and fid.Vnode. If the cnode for
---
> * in a table hashed by coda_f2i(). If the cnode for
1930c1915
< ViceFid *fid; struct mount *vfsp; short type;
---
> CodaFid *fid; struct mount *vfsp; short type;