From: VMware, Inc <>
Date: Mon, 26 Jul 2010 18:06:58 +0000 (-0700)
Subject: Changes in shared code that don't affect open-vm-tools functionality.
X-Git-Tag: 2010.07.25-280253~106
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4e1cbf3ddb75567dfb2ad1290b1bb9bd739fd967;p=thirdparty%2Fopen-vm-tools.git

Changes in shared code that don't affect open-vm-tools functionality.

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

diff --git a/open-vm-tools/lib/file/filePosix.c b/open-vm-tools/lib/file/filePosix.c
index 46fd8a17b..09d5f95f0 100644
--- a/open-vm-tools/lib/file/filePosix.c
+++ b/open-vm-tools/lib/file/filePosix.c
@@ -1757,6 +1757,16 @@ File_IsSameFile(ConstUnicode path1,  // IN:
       return FALSE;
    }
 
+   if (HostType_OSIsPureVMK()) {
+      /*
+       * On ESX, post change 1074635 the st_dev field of the stat structure
+       * is valid and differentiates between resident devices or NFS file
+       * systems - no need to use statfs to obtain file system information.
+       */
+
+      return st1.st_dev == st2.st_dev;
+   }
+
    if (Posix_Statfs(path1, &stfs1) != 0) {
       return FALSE;
    }