nvme: extend filter to match device name

nvme_match_device_filter is used by list-subsys where it is possible to
limit the output by providing a block device.

The current implementation only matches on subsystem ID level, but this
is not what the expectation is from the user. It is expected to limit
the output by the block device name.

Change the match to use the block device name instead.

Signed-off-by: Daniel Wagner <[email protected]>

Author: igaw

nvme.c

@@ -3386,33 +3386,24 @@ static int create_ns(int argc, char **argv, struct command *cmd, struct plugin *
 static bool nvme_match_device_filter(nvme_subsystem_t s,
 		nvme_ctrl_t c, nvme_ns_t ns, void *f_args)
 {
-	int ret, instance, nsid, s_num;
 	char *devname = f_args;
+	nvme_ns_t n;
 
-	if (!devname || !strlen(devname))
+	if (ns && !strcmp(devname, nvme_ns_get_name(ns)))
 		return true;
 
-	ret = sscanf(devname, "nvme%dn%d", &instance, &nsid);
-	if (ret != 2)
-		return true;
-
-	if (s) {
-		ret = sscanf(nvme_subsystem_get_name(s), "nvme-subsys%d",
-			     &s_num);
-		if (ret == 1 && s_num == instance)
-			return true;
-	}
 	if (c) {
 		s = nvme_ctrl_get_subsystem(c);
-
-		ret = sscanf(nvme_subsystem_get_name(s), "nvme-subsys%d",
-			     &s_num);
-		if (ret == 1 && s_num == instance)
-			return true;
+		nvme_ctrl_for_each_ns(c, n) {
+			if (!strcmp(devname, nvme_ns_get_name(n)))
+				return true;
+		}
 	}
-	if (ns) {
-		if (!strcmp(devname, nvme_ns_get_name(ns)))
-			return true;
+	if (s) {
+		nvme_subsystem_for_each_ns(s, n) {
+			if (!strcmp(devname, nvme_ns_get_name(n)))
+				return true;
+		}
 	}
 
 	return false;