From 830233f85efba828df8e4d8993aa6d1201c7930c Mon Sep 17 00:00:00 2001
From: jeanm <none@none>
Date: Thu, 25 May 2006 08:54:37 -0700
Subject: 6426812 metaimport partial diskset support has incorrectly deleted
 some code in libmeta

---
 usr/src/lib/lvm/libmeta/common/meta_set_prv.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'usr/src')

diff --git a/usr/src/lib/lvm/libmeta/common/meta_set_prv.c b/usr/src/lib/lvm/libmeta/common/meta_set_prv.c
index 76454d4db7..d337f9dc0f 100644
--- a/usr/src/lib/lvm/libmeta/common/meta_set_prv.c
+++ b/usr/src/lib/lvm/libmeta/common/meta_set_prv.c
@@ -35,6 +35,7 @@
 #include <sys/cladm.h>
 #include <devid.h>
 #include <sys/lvm/md_convert.h>
+#include <sdssc.h>
 
 /*
  * Exported Entry Points
@@ -645,6 +646,7 @@ setup_db_bydd(mdsetname_t *sp, md_drive_desc *dd, int force, md_error_t *ep)
 	char			*minor_name = NULL;
 	size_t			sz;
 	char			*devid_str = NULL;
+	sdssc_version_t		version;
 	int			need_to_free_devidp = 0;
 
 	if ((sd = metaget_setdesc(sp, ep)) == NULL)
@@ -730,7 +732,14 @@ setup_db_bydd(mdsetname_t *sp, md_drive_desc *dd, int force, md_error_t *ep)
 			}
 		}
 
-		if ((dnp->devid == NULL) || MD_MNSET_DESC(sd)) {
+		/*
+		 * If the device does not have a devid or is a multinode
+		 * diskset or we are in a SunCluster 3.x enviroment then
+		 * do not use devids.
+		 */
+		if ((dnp->devid == NULL) || MD_MNSET_DESC(sd) ||
+		    ((sdssc_version(&version) == SDSSC_OKAY) &&
+		    (version.major >= 3))) {
 			use_devid = 0;
 		}
 
-- 
cgit v1.2.3