]> git.ipfire.org Git - thirdparty/mdadm.git/commitdiff
Revert "Make the IMSM_DEVNAME_AS_SERIAL option work when creating containers."
authorDan Williams <dan.j.williams@intel.com>
Wed, 3 Mar 2010 07:03:04 +0000 (00:03 -0700)
committerDan Williams <dan.j.williams@intel.com>
Wed, 3 Mar 2010 07:03:04 +0000 (00:03 -0700)
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>
super-intel.c

index bbdcb511a43e0ecab7ad0987fd64d9585ad14656..fbebfcfe87e1405ac17143bdd8894fac340c1a0c 100644 (file)
@@ -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);