From: VMware, Inc <>
Date: Mon, 21 Nov 2011 23:40:30 +0000 (-0800)
Subject: Revert a previous change.
X-Git-Tag: 2011.11.20-535097~25
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=98629023bff17cb8420c3f7e1324cedcfebdfd5b;p=thirdparty%2Fopen-vm-tools.git

Revert a previous change.

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

diff --git a/open-vm-tools/lib/lock/ul.c b/open-vm-tools/lib/lock/ul.c
index b906ddc29..2bedd7575 100644
--- a/open-vm-tools/lib/lock/ul.c
+++ b/open-vm-tools/lib/lock/ul.c
@@ -157,11 +157,11 @@ MXUserSyndrome(void)
  */
 
 uint32
-MXUserGetSignature(MXUserObjectType objectType)  // IN:
+MXUserGetSignature(uint32 objectType)  // IN:
 {
    uint32 signature;
 
-   ASSERT((objectType != 0) && (objectType < 16));
+   ASSERT(objectType < 16);  // 4 bits of object type
 
    signature = (MXUserSyndrome() & 0x0FFFFFFF) | (objectType << 28);
    ASSERT(signature);
@@ -563,19 +563,14 @@ MXUser_TryAcquireFailureControl(Bool (*func)(const char *name))  // IN:
  */
 
 void
-MXUserValidateHeader(MXUserHeader *header,         // IN:
-                     MXUserObjectType objectType)  // IN:
+MXUserValidateHeader(MXUserHeader *header,  // IN:
+                     uint32 objectType)     // IN:
 {
    uint32 expected = MXUserGetSignature(objectType);
 
    if (header->signature != expected) {
-      MXUserDumpAndPanic(header,
-                         "%s: signature failure! expected %X observed %X\n",
-                         __FUNCTION__, expected, header->signature);
-   }
-
-   if (header->serialNumber == 0) {
-      MXUserDumpAndPanic(header, "%s: Invalid serial number!", __FUNCTION__);
+      MXUserDumpAndPanic(header, "%s: expected %X observed %X\n", __FUNCTION__,
+                         expected, header->signature);
    }
 }
 #endif
diff --git a/open-vm-tools/lib/lock/ulInt.h b/open-vm-tools/lib/lock/ulInt.h
index a3da3b966..61fa6e88b 100644
--- a/open-vm-tools/lib/lock/ulInt.h
+++ b/open-vm-tools/lib/lock/ulInt.h
@@ -392,18 +392,16 @@ MXUserGetThreadID(void)
 }
 
 /*
- * MXUser object type ID values.
+ * MXUser object type ID value. They must never be zero!
  */
 
-typedef enum {
-   MXUSER_TYPE_RW = 1,  // *MUST* *NEVER* start at zero
-   MXUSER_TYPE_REC,
-   MXUSER_TYPE_RANK,
-   MXUSER_TYPE_EXCL,
-   MXUSER_TYPE_SEMA,
-   MXUSER_TYPE_CONDVAR,
-   MXUSER_TYPE_BARRIER
-} MXUserObjectType;
+#define MXUSER_TYPE_RW      0x1
+#define MXUSER_TYPE_REC     0x2
+#define MXUSER_TYPE_RANK    0x3
+#define MXUSER_TYPE_EXCL    0x4
+#define MXUSER_TYPE_SEMA    0x5
+#define MXUSER_TYPE_CONDVAR 0x6
+#define MXUSER_TYPE_BARRIER 0x7
 
 /*
  * MXUser header - all MXUser objects start with this
@@ -430,7 +428,7 @@ void MXUserDumpAndPanic(MXUserHeader *header,
 
 MXRecLock *MXUserInternalSingleton(Atomic_Ptr *storage);
 
-uint32 MXUserGetSignature(MXUserObjectType objectType);
+uint32 MXUserGetSignature(uint32 objectType);
 
 #if defined(MXUSER_DEBUG)
 void MXUserAcquisitionTracking(MXUserHeader *header,
@@ -439,7 +437,7 @@ void MXUserAcquisitionTracking(MXUserHeader *header,
 void MXUserReleaseTracking(MXUserHeader *header);
 
 void MXUserValidateHeader(MXUserHeader *header,
-                          MXUserObjectType objectType);
+                          uint32 objectType);
 #else
 static INLINE void
 MXUserAcquisitionTracking(MXUserHeader *header,  // IN:
@@ -455,8 +453,8 @@ MXUserReleaseTracking(MXUserHeader *header)  // IN:
 }
 
 static INLINE void
-MXUserValidateHeader(MXUserHeader *header,     // IN:
-                     MXUserObject objectType)  // IN:
+MXUserValidateHeader(MXUserHeader *header,  // IN:
+                     uint32 objectType)     // IN:
 {
    return;
 }