fix-fstrace-for-linux-20040714

FIXES 5835

don't deadlock when flushing dcache children

diff --git a/src/afs/afs_vcache.c b/src/afs/afs_vcache.c
index 188ba6a038c55b7d7d3424b0d5d6254f6f8fba0c..0c86e81a1f4fe074d554c9603b9d28805edf121b 100644 (file)
--- a/src/afs/afs_vcache.c
+++ b/src/afs/afs_vcache.c
@@ -656,10 +656,14 @@ afs_TryFlushDcacheChildren(struct vcache *tvc)
     while ((cur = cur->next) != head) {
        dentry = list_entry(cur, struct dentry, d_alias);
 
-       afs_Trace3(afs_iclSetp, CM_TRACE_TRYFLUSHDCACHECHILDREN,
+       if (ICL_SETACTIVE(afs_iclSetp)) {
+           AFS_GLOCK();
+           afs_Trace3(afs_iclSetp, CM_TRACE_TRYFLUSHDCACHECHILDREN,
                   ICL_TYPE_POINTER, ip, ICL_TYPE_STRING,
                   dentry->d_parent->d_name.name, ICL_TYPE_STRING,
                   dentry->d_name.name);
+           AFS_GUNLOCK();
+       }
 
        if (!list_empty(&dentry->d_hash) && !list_empty(&dentry->d_subdirs))
            __shrink_dcache_parent(dentry);