linux-raid.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] super-intel: respect IMSM_DEVNAME_AS_SERIAL flag
@ 2024-02-27  6:36 Kinga Tanska
  2024-02-29 13:15 ` Mariusz Tkaczyk
  0 siblings, 1 reply; 2+ messages in thread
From: Kinga Tanska @ 2024-02-27  6:36 UTC (permalink / raw)
  To: linux-raid; +Cc: jes, mariusz.tkaczyk

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>
---
 super-intel.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/super-intel.c b/super-intel.c
index 6bdd5c4c..880e5977 100644
--- a/super-intel.c
+++ b/super-intel.c
@@ -4172,17 +4172,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",
-- 
2.26.2


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] super-intel: respect IMSM_DEVNAME_AS_SERIAL flag
  2024-02-27  6:36 [PATCH] super-intel: respect IMSM_DEVNAME_AS_SERIAL flag Kinga Tanska
@ 2024-02-29 13:15 ` Mariusz Tkaczyk
  0 siblings, 0 replies; 2+ messages in thread
From: Mariusz Tkaczyk @ 2024-02-29 13:15 UTC (permalink / raw)
  To: Kinga Tanska; +Cc: linux-raid, jes

On Tue, 27 Feb 2024 07:36:39 +0100
Kinga Tanska <kinga.tanska@intel.com> wrote:

> 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>
> ---

Applied!

Thanks,
Mariusz

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2024-02-29 13:15 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-02-27  6:36 [PATCH] super-intel: respect IMSM_DEVNAME_AS_SERIAL flag Kinga Tanska
2024-02-29 13:15 ` Mariusz Tkaczyk

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).