From: VMware, Inc <>
Date: Thu, 17 Jun 2010 21:57:22 +0000 (-0700)
Subject: More bora/lib lock ranking.
X-Git-Tag: 2010.06.16-268169~75
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c0a71bf90db1bc3d5523f133fff5b37fe1e978fb;p=thirdparty%2Fopen-vm-tools.git

More bora/lib lock ranking.

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

diff --git a/open-vm-tools/lib/hgfsServer/hgfsServer.c b/open-vm-tools/lib/hgfsServer/hgfsServer.c
index d5d8e28a9..a7fda4ef7 100644
--- a/open-vm-tools/lib/hgfsServer/hgfsServer.c
+++ b/open-vm-tools/lib/hgfsServer/hgfsServer.c
@@ -34,6 +34,7 @@
 #include "hgfsTransport.h"
 #include "userlock.h"
 #include "poll.h"
+#include "libMutexRank.h"
 
 #if defined(_WIN32)
 #include <io.h>
@@ -3090,7 +3091,8 @@ HgfsServerSessionConnect(void *transportData,                         // IN: tra
     * Initialize all our locks first as these can fail.
     */
 
-   session->fileIOLock = MXUser_CreateExclLock("HgfsFileIOLock", RANK_UNRANKED);
+   session->fileIOLock = MXUser_CreateExclLock("HgfsFileIOLock",
+                                               RANK_hgfsFileIOLock);
    if (session->fileIOLock == NULL) {
       free(session);
       LOG(4, ("%s: Could not create node array sync mutex.\n", __FUNCTION__));
@@ -3098,7 +3100,8 @@ HgfsServerSessionConnect(void *transportData,                         // IN: tra
       return FALSE;
    }
 
-   session->nodeArrayLock = MXUser_CreateExclLock("HgfsNodeArrayLock", RANK_UNRANKED);
+   session->nodeArrayLock = MXUser_CreateExclLock("HgfsNodeArrayLock",
+                                                  RANK_hgfsNodeArrayLock);
    if (session->nodeArrayLock == NULL) {
       MXUser_DestroyExclLock(session->fileIOLock);
       free(session);
@@ -3107,7 +3110,8 @@ HgfsServerSessionConnect(void *transportData,                         // IN: tra
       return FALSE;
    }
 
-   session->searchArrayLock = MXUser_CreateExclLock("HgfsSearchArrayLock", RANK_UNRANKED);
+   session->searchArrayLock = MXUser_CreateExclLock("HgfsSearchArrayLock",
+                                                    RANK_hgfsSearchArrayLock);
    if (session->searchArrayLock == NULL) {
       MXUser_DestroyExclLock(session->fileIOLock);
       MXUser_DestroyExclLock(session->nodeArrayLock);