From: Dan Williams <dan.j.williams@intel.com>
Date: Wed, 3 Mar 2010 07:03:04 +0000 (-0700)
Subject: Revert "Make the IMSM_DEVNAME_AS_SERIAL option work when creating containers."
X-Git-Tag: mdadm-3.1.2~5^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32ba9157f562de836f20e5f938b60f792957fbe8;p=thirdparty%2Fmdadm.git

Revert "Make the IMSM_DEVNAME_AS_SERIAL option work when creating containers."

This reverts commit 9ef5dbff4adc7979102e71efe8efd83d8e0dc775 as it is
duplicating the check that is done internal to imsm_read_serial().

Signed-off-by: Dan Williams <dan.j.williams@intel.com>
---

diff --git a/super-intel.c b/super-intel.c
index bbdcb511..fbebfcfe 100644
--- a/super-intel.c
+++ b/super-intel.c
@@ -3210,10 +3210,7 @@ static int add_to_super_imsm(struct supertype *st, mdu_disk_info_t *dk,
 	dd->fd = fd;
 	dd->e = NULL;
 	rv = imsm_read_serial(fd, devname, dd->serial);
-	if (rv && check_env("IMSM_DEVNAME_AS_SERIAL")) {
-		memset(dd->serial, 0, MAX_RAID_SERIAL_LEN);
-		fd2devname(fd, (char *) dd->serial);
-	} else if (rv) {
+	if (rv) {
 		fprintf(stderr,
 			Name ": failed to retrieve scsi serial, aborting\n");
 		free(dd);