tree: update nvme_scan_filter_t usage

Add two more arguments (nvme_ctrl_t and nvme_ns_t) to the nvme scan
filter to allow the implementation to distinguish between the call sites.
This allows for a more targeted approach when implementing filters.

Signed-off-by: Hannes Reinecke <[email protected]>

Author: hreinecke

src/nvme/tree.c

@@ -97,7 +97,7 @@ int nvme_scan_topology(struct nvme_root *r, nvme_scan_filter_t f)
 				 ctrls[i]->d_name, strerror(errno));
 			continue;
 		}
-		if ((f) && !f(c->s)) {
+		if ((f) && !f(NULL, c, NULL)) {
 			nvme_msg(r, LOG_DEBUG, "filter out controller %s\n",
 				 ctrls[i]->d_name);
 			nvme_free_ctrl(c);
@@ -575,7 +575,7 @@ static int nvme_scan_subsystem(struct nvme_root *r, const char *name,
 
 	nvme_subsystem_scan_namespaces(r, s);
 
-	if (f && !f(s)) {
+	if (f && !f(s, NULL, NULL)) {
 		nvme_msg(r, LOG_DEBUG, "filter out subsystem %s\n", name);
 		__nvme_free_subsystem(s);
 	}

src/nvme/tree.h

@@ -33,7 +33,7 @@ typedef struct nvme_subsystem *nvme_subsystem_t;
 typedef struct nvme_host *nvme_host_t;
 typedef struct nvme_root *nvme_root_t;
 
-typedef bool (*nvme_scan_filter_t)(nvme_subsystem_t);
+typedef bool (*nvme_scan_filter_t)(nvme_subsystem_t, nvme_ctrl_t, nvme_ns_t);
 
 /**
  * nvme_create_root() - Initialize root object

test/test.c

@@ -26,9 +26,12 @@
 
 static char *nqn_match;
 
-static bool nvme_match_subsysnqn_filter(nvme_subsystem_t s)
+static bool nvme_match_subsysnqn_filter(nvme_subsystem_t s,
+		nvme_ctrl_t c, nvme_ns_t ns)
 {
-	return strcmp(nvme_subsystem_get_nqn(s), nqn_match) == 0;
+	if (s)
+		return strcmp(nvme_subsystem_get_nqn(s), nqn_match) == 0;
+	return true;
 }
 
 static int test_ctrl(nvme_ctrl_t c)