diff options
| author | Kinga Tanska <kinga.tanska@intel.com> | 2024-02-27 07:36:39 +0100 |
|---|---|---|
| committer | Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com> | 2024-02-29 14:14:40 +0100 |
| commit | d1cd231ae41d98b2555dbff08d0c79876b5059fe (patch) | |
| tree | 24be00d76df9bcaae64e6b6e7193a14562d260a4 | |
| parent | 3c3ddeeccc1eb4accb62ce9920de430a564be806 (diff) | |
| download | mdadm-test-d1cd231ae41d98b2555dbff08d0c79876b5059fe.tar.gz | |
super-intel: respect IMSM_DEVNAME_AS_SERIAL flag
IMSM_DEVNAME_AS_SERIAL flag was respected only when searching
serial using nvme or scsi device wasn't successful. This
flag shall be applied first, to have user settings with
the highest priority.
Signed-off-by: Kinga Tanska <kinga.tanska@intel.com>
Signed-off-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
| -rw-r--r-- | super-intel.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/super-intel.c b/super-intel.c index e61f3f6f..4babec9f 100644 --- a/super-intel.c +++ b/super-intel.c @@ -4174,17 +4174,17 @@ static int imsm_read_serial(int fd, char *devname, memset(buf, 0, sizeof(buf)); + if (check_env("IMSM_DEVNAME_AS_SERIAL")) { + memset(serial, 0, serial_buf_len); + fd2devname(fd, (char *) serial); + return 0; + } + rv = nvme_get_serial(fd, buf, sizeof(buf)); if (rv) rv = scsi_get_serial(fd, buf, sizeof(buf)); - if (rv && check_env("IMSM_DEVNAME_AS_SERIAL")) { - memset(serial, 0, MAX_RAID_SERIAL_LEN); - fd2devname(fd, (char *) serial); - return 0; - } - if (rv != 0) { if (devname) pr_err("Failed to retrieve serial for %s\n", |