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 ebd9851d76fda08ef8eddc9f9016c2e0cedd1527..0107c1784b360fcab85caf385dfa21bdbf2066bd 100644 (file)
--- 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 4210a9fead705e8f04f5847cff65b951539328dd..3efdf6765e11ea446c641203ba7600b70e24c4f0 100644 (file)
--- 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.
  *