From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Thu, 12 Jun 2008 15:01:51 +0000 (+0000)
Subject: DEVEL15-windows-vnodeops-wrong-logfile-20080612
X-Git-Tag: openafs-devel-1_5_50~96
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=4ed6721bbf5dae1235adc53ed0e89d0b6792d6e4;p=packages%2Fo%2Fopenafs.git

DEVEL15-windows-vnodeops-wrong-logfile-20080612

LICENSE MIT

Use afsd_logp instead of smb_logp in osi_LogX() calls.
Do not violate layer abstraction.


(cherry picked from commit 3306c0887b62ca940808174906c2579b3b7d939a)
---

diff --git a/src/WINNT/afsd/cm_vnodeops.c b/src/WINNT/afsd/cm_vnodeops.c
index 3a81f8594..a0ae47025 100644
--- a/src/WINNT/afsd/cm_vnodeops.c
+++ b/src/WINNT/afsd/cm_vnodeops.c
@@ -2974,7 +2974,7 @@ long cm_Link(cm_scache_t *dscp, char *namep, cm_scache_t *sscp, long flags,
         code = RXAFS_Link(callp, &dirAFSFid, namep, &existingAFSFid,
             &newLinkStatus, &updatedDirStatus, &volSync);
         rx_PutConnection(callp);
-        osi_Log1(smb_logp,"  RXAFS_Link returns 0x%x", code);
+        osi_Log1(afsd_logp,"  RXAFS_Link returns 0x%x", code);
 
     } while (cm_Analyze(connp, userp, reqp,
         &dscp->fid, &volSync, NULL, NULL, code));
@@ -4973,7 +4973,7 @@ void cm_CheckLocks()
                                  | CM_SCACHESYNC_LOCK);
 
                 if (code) {
-                    osi_Log1(smb_logp,
+                    osi_Log1(afsd_logp,
                              "cm_CheckLocks SyncOp failure code 0x%x", code);
                     goto post_syncopdone;
                 }
@@ -5299,7 +5299,7 @@ long cm_RetryLock(cm_file_lock_t *oldFileLock, int client_is_dead)
 			 | CM_SCACHESYNC_GETSTATUS
 			 | CM_SCACHESYNC_LOCK);
         if (code) {
-            osi_Log1(smb_logp, "cm_RetryLock SyncOp failure code 0x%x", code);
+            osi_Log1(afsd_logp, "cm_RetryLock SyncOp failure code 0x%x", code);
             lock_ReleaseWrite(&cm_scacheLock);
             goto post_syncopdone;
         }