Dan Williams: Revert " Make the IMSM_DEVNAME_AS_SERIAL option work when creating containers."
Martin F. Krafft
madduck at alioth.debian.org
Mon May 24 09:21:13 UTC 2010
Module: mdadm
Branch: upstream
Commit: 32ba9157f562de836f20e5f938b60f792957fbe8
URL: http://git.debian.org/?p=pkg-mdadm/mdadm.git;a=commit;h=32ba9157f562de836f20e5f938b60f792957fbe8
Author: Dan Williams <dan.j.williams at intel.com>
Date: Wed Mar 3 00:03:04 2010 -0700
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 at intel.com>
---
super-intel.c | 5 +----
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);
More information about the pkg-mdadm-commits
mailing list