From: Kruti <kpendharkar@vmware.com>
Date: Mon, 18 Mar 2024 18:03:48 +0000 (-0700)
Subject: Change to common source file not applicable to open-vm-tools.
X-Git-Tag: stable-12.5.0~127
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3ca1f9beea77e7423c1c21d8f698b18d4ebe942;p=thirdparty%2Fopen-vm-tools.git

Change to common source file 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 eaf5da443..a62a0b2bf 100644
--- a/open-vm-tools/lib/file/filePosix.c
+++ b/open-vm-tools/lib/file/filePosix.c
@@ -1,5 +1,6 @@
 /*********************************************************
- * Copyright (c) 2006-2021, 2023 VMware, Inc. All rights reserved.
+ * Copyright (c) 2006-2024 Broadcom. All rights reserved.
+ * The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published
@@ -1688,10 +1689,12 @@ File_DoesVolumeSupportConvertBlocks(const char *pathName)  // IN:
 
    /*
     * Only regular VMFS (no VMFS-L, VMFSOS, or other oddities) and
-    * only version 6 and above.
+    * only version 6 and above. Also, no VMFS on VSAN/VVol objects.
     */
    supports = Str_Strcmp(fsAttrs->fsType, FS_VMFS_ON_ESX) == 0 &&
-      fsAttrs->versionNumber >= 6;
+      fsAttrs->versionNumber >= 6 &&
+      strcmp(fsAttrs->driverType, "vsan") != 0 &&
+      strcmp(fsAttrs->driverType, "vvol") != 0;
 
    Posix_Free(fsAttrs);
    return supports;