From: VMware, Inc <>
Date: Mon, 26 Apr 2010 18:04:36 +0000 (-0700)
Subject: Trivial: Remove hgfsServer.h dependency
X-Git-Tag: 2010.04.25-253928~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8b9bfcdd054837dd6cd2e09fc8189960472cf36;p=thirdparty%2Fopen-vm-tools.git

Trivial: Remove hgfsServer.h dependency

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

diff --git a/open-vm-tools/lib/include/hgfsServer.h b/open-vm-tools/lib/include/hgfsServer.h
index e8f01f7b9..29c8faef0 100644
--- a/open-vm-tools/lib/include/hgfsServer.h
+++ b/open-vm-tools/lib/include/hgfsServer.h
@@ -35,8 +35,6 @@ typedef struct HgfsServerStateLogger {
    void                       *loggerData;   // logger callback private data
 } HgfsServerStateLogger;
 
-
-#define HGFS_MAX_IOV 3
 #define HGFS_BUF_READABLE  0x0000cafe
 #define HGFS_BUF_WRITEABLE 0x0000babe
 
diff --git a/open-vm-tools/lib/include/hgfsTransport.h b/open-vm-tools/lib/include/hgfsTransport.h
index 2e68f8534..109b6b371 100644
--- a/open-vm-tools/lib/include/hgfsTransport.h
+++ b/open-vm-tools/lib/include/hgfsTransport.h
@@ -40,7 +40,6 @@
 # define _HGFS_TRANSPORT_H_
 
 #include "vmci_defs.h"
-#include "hgfsServer.h"   /* For HGFS_MAX_IOV */
 
 /****************************************
  * Vsock, Tcp specific data structures  *
diff --git a/open-vm-tools/modules/linux/vmhgfs/request.h b/open-vm-tools/modules/linux/vmhgfs/request.h
index 29a5483f7..3eae8389e 100644
--- a/open-vm-tools/modules/linux/vmhgfs/request.h
+++ b/open-vm-tools/modules/linux/vmhgfs/request.h
@@ -45,8 +45,6 @@
 #define HGFS_REQ_PAYLOAD_V3(hgfsReq) (HGFS_REQ_PAYLOAD(hgfsReq) + sizeof(HgfsRequest))
 #define HGFS_REP_PAYLOAD_V3(hgfsRep) (HGFS_REQ_PAYLOAD(hgfsRep) + sizeof(HgfsReply))
 
-#define HGFS_MAX_PAGES 2
-
 /*
  * HGFS_REQ_STATE_ALLOCATED:
  *    The filesystem half has allocated the request from the slab
diff --git a/open-vm-tools/modules/linux/vmhgfs/vmci.c b/open-vm-tools/modules/linux/vmhgfs/vmci.c
index b3c139df2..617165293 100644
--- a/open-vm-tools/modules/linux/vmhgfs/vmci.c
+++ b/open-vm-tools/modules/linux/vmhgfs/vmci.c
@@ -370,8 +370,6 @@ HgfsVmciChannelSend(HgfsTransportChannel *channel, // IN: Channel
 
    transportHeader->iovCount = iovCount;
 
-   ASSERT(iovCount <= HGFS_MAX_IOV);
-
    /* Initialize transport Status */
    transportStatus = (HgfsVmciTransportStatus *)req->buffer;
    transportStatus->status = HGFS_VMCI_IO_PENDING;