From: VMware, Inc <>
Date: Thu, 17 Jun 2010 21:27:47 +0000 (-0700)
Subject: lib/lock: assertion failure
X-Git-Tag: 2010.06.16-268169~123
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e8dd62dd1b7d26c13cef012d87d16522ad4ff2a7;p=thirdparty%2Fopen-vm-tools.git

lib/lock: assertion failure

The assertion with the tryLock failed... in the wrong place.

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

diff --git a/open-vm-tools/lib/lock/ulInt.h b/open-vm-tools/lib/lock/ulInt.h
index 17637cd41..ccb3be1a3 100644
--- a/open-vm-tools/lib/lock/ulInt.h
+++ b/open-vm-tools/lib/lock/ulInt.h
@@ -329,11 +329,11 @@ MXRecLockTryAcquire(MXRecLock *lock,  // IN/OUT:
    err = MXRecLockTryAcquireInternal(lock);
 
    if (err == 0) {
+      MXRecLockIncCount(lock, location);
+
       ASSERT((MXRecLockCount(lock) > 0) &&
              (MXRecLockCount(lock) < MXUSER_MAX_REC_DEPTH));
 
-      MXRecLockIncCount(lock, location);
-
       acquired = TRUE;
    } else {
       if (vmx86_debug && (err != EBUSY)) {