From: VMware, Inc <>
Date: Mon, 21 May 2012 22:20:45 +0000 (-0700)
Subject: lib/lock: clarify reference count and lock count
X-Git-Tag: 2012.05.21-724730~48
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=babee8d2e4f775339f62a67dd623f5163364fb35;p=thirdparty%2Fopen-vm-tools.git

lib/lock: clarify reference count and lock count

We've got reference counting on locks which is different than
the lock count (recursive depth). Disambiguate the names.

Signed-off-by: Dmitry Torokhov <dtor@vmware.com>
---

diff --git a/open-vm-tools/lib/lock/ulExcl.c b/open-vm-tools/lib/lock/ulExcl.c
index ed6e8b8af..b12c7725e 100644
--- a/open-vm-tools/lib/lock/ulExcl.c
+++ b/open-vm-tools/lib/lock/ulExcl.c
@@ -294,7 +294,7 @@ MXUserDumpExclLock(MXUserHeader *header)  // IN:
    Warning("\trank 0x%X\n", lock->header.rank);
    Warning("\tserial number %u\n", lock->header.serialNumber);
 
-   Warning("\tcount %d\n", MXRecLockCount(&lock->recursiveLock));
+   Warning("\tlock count %d\n", MXRecLockCount(&lock->recursiveLock));
 
    Warning("\taddress of owner data %p\n",
            &lock->recursiveLock.nativeThreadID);
diff --git a/open-vm-tools/lib/lock/ulRec.c b/open-vm-tools/lib/lock/ulRec.c
index b678b458f..a0e672cae 100644
--- a/open-vm-tools/lib/lock/ulRec.c
+++ b/open-vm-tools/lib/lock/ulRec.c
@@ -317,7 +317,7 @@ MXUserDumpRecLock(MXUserHeader *header)  // IN:
    Warning("\treference count %u\n", Atomic_Read(&lock->refCount));
 
    if (lock->vmmLock == NULL) {
-      Warning("\tcount %d\n", MXRecLockCount(&lock->recursiveLock));
+      Warning("\tlock count %d\n", MXRecLockCount(&lock->recursiveLock));
 
       Warning("\taddress of owner data %p\n",
               &lock->recursiveLock.nativeThreadID);