summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2010-03-03 00:03:04 -0700
committerDan Williams <dan.j.williams@intel.com>2010-03-03 00:03:04 -0700
commit32ba9157f562de836f20e5f938b60f792957fbe8 (patch)
tree10026b30bd475a5995ece9c36ae51eb9318d8f7d
parenta380e2751efea7dfe8acf0b95419c65ccacfa7cf (diff)
downloadmdadm-32ba9157f562de836f20e5f938b60f792957fbe8.tar.gz
mdadm-32ba9157f562de836f20e5f938b60f792957fbe8.tar.xz
mdadm-32ba9157f562de836f20e5f938b60f792957fbe8.zip
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>
-rw-r--r--super-intel.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/super-intel.c b/super-intel.c
index bbdcb51..fbebfcf 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);