From: VMware, Inc <>
Date: Mon, 20 Sep 2010 18:04:22 +0000 (-0700)
Subject: More HGFS-over-VMCI backouts.
X-Git-Tag: stable-8.6.0~18
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ea635fc5fa09b43962bdacb7192712cec6d82208;p=thirdparty%2Fopen-vm-tools.git

More HGFS-over-VMCI backouts.

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

diff --git a/open-vm-tools/modules/freebsd/vmhgfs/bdhandler.c b/open-vm-tools/modules/freebsd/vmhgfs/bdhandler.c
index a0160cb05..6403c3fc4 100644
--- a/open-vm-tools/modules/freebsd/vmhgfs/bdhandler.c
+++ b/open-vm-tools/modules/freebsd/vmhgfs/bdhandler.c
@@ -64,7 +64,7 @@ HgfsBdChannelOpen(HgfsTransportChannel *channel) // IN: Channel
 {
    Bool ret;
 
-   ASSERT_DEVEL(channel->status == HGFS_CHANNEL_NOTCONNECTED);
+   ASSERT(channel->status == HGFS_CHANNEL_NOTCONNECTED);
 
    if ((ret = HgfsBd_OpenBackdoor((RpcOut **)&channel->priv))) {
       DEBUG(VM_DEBUG_INFO, "VMware hgfs: %s: backdoor opened.\n", __func__);
@@ -96,13 +96,10 @@ static void
 HgfsBdChannelClose(HgfsTransportChannel *channel) // IN: Channel
 {
    int ret;
-
-   if (channel->priv == NULL) {
-      return;
-   }
+   ASSERT(channel->priv != NULL);
 
    ret = HgfsBd_CloseBackdoor((RpcOut **)&channel->priv);
-   ASSERT_DEVEL(channel->priv == NULL);
+   ASSERT(channel->priv == NULL);
    if (!ret) {
       DEBUG(VM_DEBUG_FAIL, "VMware hgfs: %s: Failed to close backdoor.\n", __func__);
    } else {