From: Oliver Kurth <okurth@vmware.com>
Date: Tue, 26 May 2020 22:32:58 +0000 (-0700)
Subject: Changes to common source files not applicable to open-vm-tools.
X-Git-Tag: stable-11.2.0~194
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=53473f83f7dfda6a0b592bbfdf1a5e6144b426e7;p=thirdparty%2Fopen-vm-tools.git

Changes to common source files not applicable to open-vm-tools.
---

diff --git a/open-vm-tools/lib/file/filePosix.c b/open-vm-tools/lib/file/filePosix.c
index 0cf874ebc..5681ebfd3 100644
--- a/open-vm-tools/lib/file/filePosix.c
+++ b/open-vm-tools/lib/file/filePosix.c
@@ -111,6 +111,8 @@ struct WalkDirContextImpl {
 #define FS_NFS_ON_ESX "NFS"
 /* A string for VMFS on ESX file system type */
 #define FS_VMFS_ON_ESX "VMFS"
+/* A string for vsanD on ESX file system type */
+#define FS_VSAND_ON_ESX "vsanD"
 #define FS_VSAN_URI_PREFIX      "vsan:"
 
 #if defined __ANDROID__
@@ -1488,6 +1490,10 @@ FileIsVMFS(const char *pathName)  // IN:
       /* We want to match anything that starts with VMFS */
       result = strncmp(fsAttrs->fsType, FS_VMFS_ON_ESX,
                        strlen(FS_VMFS_ON_ESX)) == 0;
+      if (!result) {
+         result = strncmp(fsAttrs->fsType, FS_VSAND_ON_ESX,
+                          strlen(FS_VSAND_ON_ESX)) == 0;
+      }
    } else {
       Log(LGPFX" %s: File_GetVMFSAttributes failed\n", __func__);
    }