From: VMware, Inc <>
Date: Tue, 28 Jun 2011 20:19:19 +0000 (-0700)
Subject: Changes in shared code that don't affect open-vm-tools functionality.
X-Git-Tag: 2011.06.27-437995~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2ccded7180d0ec8bd2176989ee77cc5bf3e7d5af;p=thirdparty%2Fopen-vm-tools.git

Changes in shared code that don't affect open-vm-tools functionality.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>
---

diff --git a/open-vm-tools/lib/include/mutexRankLib.h b/open-vm-tools/lib/include/mutexRankLib.h
index ebd9851d7..0107c1784 100644
--- a/open-vm-tools/lib/include/mutexRankLib.h
+++ b/open-vm-tools/lib/include/mutexRankLib.h
@@ -81,7 +81,8 @@
 #define RANK_vmioPluginEvtLock       (RANK_libLockBase + 0x5030)
 #define RANK_vmioPluginSysLock       (RANK_libLockBase + 0x5040)
 #define RANK_fsCmdLock               (RANK_libLockBase + 0x5050)
-#define RANK_parInitLock             (RANK_libLockBase + 0x5060)
+#define RANK_scsiStateLock           (RANK_libLockBase + 0x5060)
+#define RANK_parInitLock             (RANK_libLockBase + 0x5070)
 
 /*
  * RANK_vigorClientLock < VMDB range
diff --git a/open-vm-tools/lib/misc/hostinfoPosix.c b/open-vm-tools/lib/misc/hostinfoPosix.c
index 4210a9fea..3efdf6765 100644
--- a/open-vm-tools/lib/misc/hostinfoPosix.c
+++ b/open-vm-tools/lib/misc/hostinfoPosix.c
@@ -1719,6 +1719,9 @@ HostinfoSystemTimerPosix(VmTimeType *result)  // OUT
  *      The actual resolution of these "clocks" are undefined - it varies
  *      depending on hardware, OSen and OS versions.
  *
+ *     *** NOTE: This function and all children must be callable
+ *     while RANK_logLock is held. ***
+ *
  * Results:
  *      The time in nanoseconds is returned. Zero upon error.
  *