[dm-devel] [PATCH v3 16/18] fixup! libmultipath: add code to get vendor specific vpd data

[Benjamin Marzinski]

From: Martin Wilck <mwilck at suse.com>

Signed-off-by: Benjamin Marzinski <bmarzins at redhat.com>
---
 libmultipath/discovery.c | 2 +-
 libmultipath/propsel.c   | 2 +-
 libmultipath/propsel.h   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libmultipath/discovery.c b/libmultipath/discovery.c
index 33a313a2..23a7889c 100644
--- a/libmultipath/discovery.c
+++ b/libmultipath/discovery.c
@@ -1646,7 +1646,7 @@ scsi_ioctl_pathinfo (struct path * pp, int mask)
 	if (!(mask & DI_SERIAL))
 		return;
 
-	select_vpd_vendor_id(conf, pp);
+	select_vpd_vendor_id(pp);
 	vpd_id = pp->vpd_vendor_id;
 
 	if (vpd_id != VPD_VP_UNDEF && get_vpd_sgio(pp->fd, vpd_vendor_pages[vpd_id].pg, vpd_id, pp->vpd_data, sizeof(pp->vpd_data)) < 0)
diff --git a/libmultipath/propsel.c b/libmultipath/propsel.c
index 8a2d9872..897e48ca 100644
--- a/libmultipath/propsel.c
+++ b/libmultipath/propsel.c
@@ -1218,7 +1218,7 @@ out:
 	return 0;
 }
 
-int select_vpd_vendor_id (struct config *conf, struct path *pp)
+int select_vpd_vendor_id (struct path *pp)
 {
 	const char *origin;
 
diff --git a/libmultipath/propsel.h b/libmultipath/propsel.h
index 4fa08e1f..3d6edd8a 100644
--- a/libmultipath/propsel.h
+++ b/libmultipath/propsel.h
@@ -37,4 +37,4 @@ void reconcile_features_with_options(const char *id, char **features,
 				     int* no_path_retry,
 				     int *retain_hwhandler);
 int select_all_tg_pt (struct config *conf, struct multipath * mp);
-int select_vpd_vendor_id (struct config *conf, struct path *pp);
+int select_vpd_vendor_id (struct path *pp);
-- 
2.17.2