From: VMware, Inc <>
Date: Mon, 22 Aug 2011 20:23:56 +0000 (-0700)
Subject: Changes in shared code that don't affect open-vm-tools functionality.
X-Git-Tag: 2011.08.21-471295~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=469d7ecd0c591865e48baa833928b4c8eb5bc70b;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 71cdd8f4e..fecf31a50 100644
--- a/open-vm-tools/lib/include/mutexRankLib.h
+++ b/open-vm-tools/lib/include/mutexRankLib.h
@@ -38,13 +38,13 @@
 /*
  * hostDeviceInfo HAL lock
  *
- * Must be > vmhs locks since this is held around the RANK_vmhsHDILock
+ * Must be < vmhs locks since this is held around the RANK_vmhsHDILock
  * callback lock which vmhs passes into that library.
  */
 #define RANK_hdiHALLock             (RANK_libLockBase + 0x1005)
 
 /*
- * vmhs locks
+ * vmhs locks (must be < vigor)
  */
 #define RANK_vmhsHDILock            (RANK_libLockBase + 0x3002)
 #define RANK_vmhsThrMxLock          (RANK_libLockBase + 0x3005)
@@ -76,6 +76,12 @@
  */
 #define RANK_popPendingListLock      (RANK_libLockBase + 0x4605)
 
+/*
+ * vigor (must be < VMDB range and < disklib, see bug 741290)
+ */
+#define RANK_vigorClientLock         (RANK_libLockBase + 0x4700)
+#define RANK_vigorOfflineClientLock  (RANK_libLockBase + 0x4710)
+
 /*
  * disklib and I/O related locks
  */
@@ -89,12 +95,6 @@
 #define RANK_scsiStateLock           (RANK_libLockBase + 0x5060)
 #define RANK_parInitLock             (RANK_libLockBase + 0x5070)
 
-/*
- * RANK_vigorClientLock < VMDB range
- */
-#define RANK_vigorClientLock         (RANK_libLockBase + 0x5400)
-#define RANK_vigorOfflineClientLock  (RANK_libLockBase + 0x5410)
-
 /*
  * VMDB range:
  * (RANK_libLockBase + 0x5500, RANK_libLockBase + 0x5600)