From f9f9a7ab1791bfce1e2d442c683bb664dd2ab630 Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Fri, 8 Feb 2013 14:17:12 -0500 Subject: [PATCH] Windows: Move Trace Stmts from FILE to CLEANUP Relabel trace statements in AFSRemoveDirNodeFromParent, AFSRemoveNameEntry, AFSDeleteDirEntry, and AFSRemoveFcb from the FILE subsystem to the CLEANUP subsystem. This assists in reducing the noise when attempting to watch the file system requests that are received by the afs redirector. Change-Id: I0aa8c090b176a7d2fa6feb9866e7c8e9f621c2df Reviewed-on: http://gerrit.openafs.org/9089 Tested-by: BuildBot Reviewed-by: Jeffrey Altman Tested-by: Jeffrey Altman --- src/WINNT/afsrdr/kernel/lib/AFSFcbSupport.cpp | 2 +- src/WINNT/afsrdr/kernel/lib/AFSGeneric.cpp | 10 +++++----- src/WINNT/afsrdr/kernel/lib/AFSNameSupport.cpp | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/WINNT/afsrdr/kernel/lib/AFSFcbSupport.cpp b/src/WINNT/afsrdr/kernel/lib/AFSFcbSupport.cpp index 0e1c57298..6c771b782 100644 --- a/src/WINNT/afsrdr/kernel/lib/AFSFcbSupport.cpp +++ b/src/WINNT/afsrdr/kernel/lib/AFSFcbSupport.cpp @@ -1225,7 +1225,7 @@ AFSRemoveFcb( IN AFSFcb **ppFcb) // Uninitialize the file lock if it is a file // - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgLogMsg( AFS_SUBSYSTEM_CLEANUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSRemoveFcb Removing Fcb %p\n", pFcb); diff --git a/src/WINNT/afsrdr/kernel/lib/AFSGeneric.cpp b/src/WINNT/afsrdr/kernel/lib/AFSGeneric.cpp index 78600a68f..5a1b9c38a 100644 --- a/src/WINNT/afsrdr/kernel/lib/AFSGeneric.cpp +++ b/src/WINNT/afsrdr/kernel/lib/AFSGeneric.cpp @@ -7854,7 +7854,7 @@ AFSRemoveNameEntry( IN AFSObjectInfoCB *ParentObjectInfo, if( BooleanFlagOn( DirEntry->Flags, AFS_DIR_ENTRY_NOT_IN_PARENT_TREE)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgLogMsg( AFS_SUBSYSTEM_CLEANUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSRemoveNameEntry DE %p for %wZ has NOT_IN flag set\n", DirEntry, @@ -7869,7 +7869,7 @@ AFSRemoveNameEntry( IN AFSObjectInfoCB *ParentObjectInfo, // Remove the entry from the parent tree // - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgLogMsg( AFS_SUBSYSTEM_CLEANUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSRemoveNameEntry DE %p for %wZ removing from case sensitive tree\n", DirEntry, @@ -7878,7 +7878,7 @@ AFSRemoveNameEntry( IN AFSObjectInfoCB *ParentObjectInfo, AFSRemoveCaseSensitiveDirEntry( &ParentObjectInfo->Specific.Directory.DirectoryNodeHdr.CaseSensitiveTreeHead, DirEntry); - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgLogMsg( AFS_SUBSYSTEM_CLEANUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSRemoveNameEntry DE %p for %wZ removing from case insensitive tree\n", DirEntry, @@ -7894,7 +7894,7 @@ AFSRemoveNameEntry( IN AFSObjectInfoCB *ParentObjectInfo, // From the short name tree // - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgLogMsg( AFS_SUBSYSTEM_CLEANUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSRemoveNameEntry DE %p for %wZ removing from shortname tree\n", DirEntry, @@ -7906,7 +7906,7 @@ AFSRemoveNameEntry( IN AFSObjectInfoCB *ParentObjectInfo, ClearFlag( DirEntry->Flags, AFS_DIR_ENTRY_INSERTED_SHORT_NAME); } - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgLogMsg( AFS_SUBSYSTEM_CLEANUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSRemoveNameEntry DE %p for %wZ setting NOT_IN flag\n", DirEntry, diff --git a/src/WINNT/afsrdr/kernel/lib/AFSNameSupport.cpp b/src/WINNT/afsrdr/kernel/lib/AFSNameSupport.cpp index f00257f32..5f962a38b 100644 --- a/src/WINNT/afsrdr/kernel/lib/AFSNameSupport.cpp +++ b/src/WINNT/afsrdr/kernel/lib/AFSNameSupport.cpp @@ -2706,7 +2706,7 @@ AFSDeleteDirEntry( IN AFSObjectInfoCB *ParentObjectInfo, __Enter { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING | AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgLogMsg( AFS_SUBSYSTEM_CLEANUP_PROCESSING | AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSDeleteDirEntry Deleting dir entry in parent %p Entry %p %wZ FID %08lX-%08lX-%08lX-%08lX RefCount %d\n", ParentObjectInfo, @@ -2792,7 +2792,7 @@ AFSRemoveDirNodeFromParent( IN AFSObjectInfoCB *ParentObjectInfo, ASSERT( ExIsResourceAcquiredExclusiveLite( ParentObjectInfo->Specific.Directory.DirectoryNodeHdr.TreeLock)); - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgLogMsg( AFS_SUBSYSTEM_CLEANUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSRemoveDirNodeFromParent Removing DirEntry %p %wZ FID %08lX-%08lX-%08lX-%08lX from Parent %p\n", DirEntry, @@ -2806,7 +2806,7 @@ AFSRemoveDirNodeFromParent( IN AFSObjectInfoCB *ParentObjectInfo, if( !BooleanFlagOn( DirEntry->Flags, AFS_DIR_ENTRY_NOT_IN_PARENT_TREE)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgLogMsg( AFS_SUBSYSTEM_CLEANUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSRemoveDirNodeFromParent Removing DirEntry %p name %wZ\n", DirEntry, @@ -2818,7 +2818,7 @@ AFSRemoveDirNodeFromParent( IN AFSObjectInfoCB *ParentObjectInfo, else { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgLogMsg( AFS_SUBSYSTEM_CLEANUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSRemoveDirNodeFromParent DE %p for %wZ NOT removing entry due to flag set\n", DirEntry, -- 2.39.5