From: John Wolfe <jwolfe@vmware.com>
Date: Mon, 9 Nov 2020 20:29:02 +0000 (-0800)
Subject: Common header file change not applicable to open-vm-tools.
X-Git-Tag: stable-11.3.0~271
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e47338fd721f3393823d778e487ee3c937594311;p=thirdparty%2Fopen-vm-tools.git

Common header file change not applicable to open-vm-tools.
---

diff --git a/open-vm-tools/lib/include/mutexRankLib.h b/open-vm-tools/lib/include/mutexRankLib.h
index 1cfebd1ce..2d22cb4d6 100644
--- a/open-vm-tools/lib/include/mutexRankLib.h
+++ b/open-vm-tools/lib/include/mutexRankLib.h
@@ -74,10 +74,24 @@ extern "C" {
 #define RANK_vigorOnlineLock         (RANK_libLockBase + 0x4400)
 #define RANK_vigorOfflineLock        (RANK_libLockBase + 0x4410)
 
+/*
+ * The lock range for IO filters:
+ * [RANK_libLockBase + 0x4420 , RANK_libLockBase + 0x442F]
+ *
+ * (must be > vigor and < filtlib, see PR 2613901)
+ * Inbox filters may need to use lock ranks and these filters can be loaded
+ * under Vigor-Offline. Therefore, any lock used by a filter in its callbacks
+ * should have a rank greater than RANK_vigorOfflineLock. Moreover, filter lock
+ * ranks should be lower than RANK_filtLibPollLock because these filters use
+ * VMIOF APIs and an API like "VMIOF_TimerAdd" which holds RANK_filtLibPollLock,
+ * cannot be invoked while holding a filter lock.
+ */
+#define RANK_ioFiltersBase            (RANK_libLockBase + 0x4420)
+
 /*
  * filtlib (must be > vigor and < disklib and workercmlp, PR 1340298)
  */
-#define RANK_filtLibPollLock         (RANK_vigorOfflineLock + 1)
+#define RANK_filtLibPollLock         (RANK_libLockBase + 0x4430)
 
 /*
  * filtib lock which protects a disk's allocation bitmap state.