STABLE14-memcache-dont-dump-buffer-20050529

FIXES 18944

don't bother dumping what may not be a readable buffer while tracing when using memcache

(cherry picked from commit b56513ffd69bbcd94afb2b1e1509aae63fa438fc)

diff --git a/src/afs/afs_memcache.c b/src/afs/afs_memcache.c
index 786ec62cc22e30370f957f067680795d9def1676..8e70a53deb2528e312a80301a66c707dfda57126 100644 (file)
--- a/src/afs/afs_memcache.c
+++ b/src/afs/afs_memcache.c
@@ -103,9 +103,8 @@ afs_MemCacheOpen(afs_int32 blkno)
        osi_Panic("afs_MemCacheOpen: invalid block #");
     }
     mep = (memCache + blkno);
-    afs_Trace4(afs_iclSetp, CM_TRACE_MEMOPEN, ICL_TYPE_INT32, blkno,
-              ICL_TYPE_POINTER, mep, ICL_TYPE_POINTER, mep->data,
-              ICL_TYPE_STRING, mep->data);
+    afs_Trace3(afs_iclSetp, CM_TRACE_MEMOPEN, ICL_TYPE_INT32, blkno,
+              ICL_TYPE_POINTER, mep, ICL_TYPE_POINTER, mep ? mep->data : 0);
     return (void *)mep;
 }
 

diff --git a/src/afs/afs_trace.et b/src/afs/afs_trace.et
index 854ea23ff50261065ad1ca9f53a1a05693831150..cf81f078d9ce1ef907959309e864c6683a60987e 100644 (file)
--- a/src/afs/afs_trace.et
+++ b/src/afs/afs_trace.et
@@ -145,7 +145,7 @@ error_table 2 ZCM
        ec      CM_TRACE_MEMFETCH, "MemFetch: vp 0x%lx  mceP 0x%lx offset (0x%x, 0x%x) length 0x%x"
        ec      CM_TRACE_VMWRITE3, "afs_vm_rdwr: vp 0x%lx code %d"
        ec      CM_TRACE_STOREALL2, "StoreAll 2 vp 0x%lx chunk 0x%x index %d inode %d"
-       ec      CM_TRACE_MEMOPEN, "MemOpen blkno %d mceP 0x%x data 0x%x = %s"
+       ec      CM_TRACE_MEMOPEN, "MemOpen blkno %d mceP 0x%x data 0x%x"
        ec      CM_TRACE_VCACHE2INODE, "vcache2inode: avc 0x%x event %d"
        ec      CM_TRACE_STOREDATA64, "StoreData64: fid (%d:%d.%d.%d) offs (0x%x, 0x%x) len (0x%x, 0x%x) file length (0x%x, 0x%x)"
        ec      CM_TRACE_RESIDCMD, "ResidencyCmd tvc 0x%x command %d fid (%d:%d.%d.%d)"