From: John Wolfe <jwolfe@vmware.com>
Date: Mon, 19 Apr 2021 18:08:10 +0000 (-0700)
Subject: Common header file change not applicable to open-vm-tools.
X-Git-Tag: stable-11.3.0~66
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b9c4441ed7316d1f807697c7145e2c09656f3e5e;p=thirdparty%2Fopen-vm-tools.git

Common header file change not applicable to open-vm-tools.
---

diff --git a/open-vm-tools/lib/include/vmfs.h b/open-vm-tools/lib/include/vmfs.h
index aabf163e8..1322922e3 100644
--- a/open-vm-tools/lib/include/vmfs.h
+++ b/open-vm-tools/lib/include/vmfs.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2003-2017 VMware, Inc. All rights reserved.
+ * Copyright (C) 2003-2020 VMware, Inc. All rights reserved.
  *
  * 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
@@ -78,7 +78,7 @@ extern "C" {
 #define VDFM_MOUNT_PATH                 VDFM_MOUNT_POINT "/"
 
 #define CDROM_DRIVER_STRING             "cdrom"
-#define SCSI_DISK_DRIVER_STRING         "disks"
+#define PSA_STOR_DISK_DRIVER_STRING     "disks"
 #define SCSI_GENERIC_DRIVER_STRING      "genscsi"
 #define OLD_SCSI_GENERIC_DRIVER_STRING  "generic"
 #define COW_DRIVER_NAME                 "deltadisks"
@@ -87,7 +87,7 @@ extern "C" {
 #define FDS_DRIVER_ALL_STRING           "fdsall"
 
 #define CDROM_MOUNT_POINT               DEVFS_MOUNT_PATH CDROM_DRIVER_STRING
-#define DISKS_MOUNT_POINT               DEVFS_MOUNT_PATH SCSI_DISK_DRIVER_STRING
+#define DISKS_MOUNT_POINT               DEVFS_MOUNT_PATH PSA_STOR_DISK_DRIVER_STRING
 #define GENERIC_SCSI_MOUNT_POINT        DEVFS_MOUNT_PATH SCSI_GENERIC_DRIVER_STRING
 #define MULTI_EXTENT_MOUNT_POINT	DEVFS_MOUNT_PATH MULTI_EXTENT_DIR_NAME
 #define CDROM_MOUNT_PATH                CDROM_MOUNT_POINT "/"
@@ -97,7 +97,7 @@ extern "C" {
 
 #define VISOR_DEVFS_MOUNT_PATH          "/dev/"
 #define VISOR_CDROM_MOUNT_POINT         VISOR_DEVFS_MOUNT_PATH CDROM_DRIVER_STRING
-#define VISOR_DISKS_MOUNT_POINT         VISOR_DEVFS_MOUNT_PATH SCSI_DISK_DRIVER_STRING
+#define VISOR_DISKS_MOUNT_POINT         VISOR_DEVFS_MOUNT_PATH PSA_STOR_DISK_DRIVER_STRING
 #define VISOR_GENERIC_SCSI_MOUNT_POINT  VISOR_DEVFS_MOUNT_PATH SCSI_GENERIC_DRIVER_STRING
 #define VISOR_CDROM_MOUNT_PATH          VISOR_CDROM_MOUNT_POINT "/"
 #define VISOR_DISKS_MOUNT_PATH          VISOR_DISKS_MOUNT_POINT "/"