libnvme : record the nvme pci adapter physical slot

shroffni · dwsuse · commit ea5600c84308 · 2024-03-21T14:47:33.000+01:00
There is a subtle bug in the nvme controller physical
slot lookup code due to which the readdir() prematurely
aborts the lookup and hence libnvme fails to record the
pci slot address of the nvme controller. This patch helps
to fix this issue.

Signed-off-by: Nilay Shroff &lt;nilay@linux.ibm.com&gt;
Signed-off-by: Daniel Wagner &lt;dwagner@suse.de&gt;
diff --git a/src/nvme/tree.c b/src/nvme/tree.c
@@ -1729,7 +1729,7 @@ static char *nvme_ctrl_lookup_phy_slot(nvme_root_t r, const char *address)
 	}
 
 	target_addr = strndup(address, 10);
-	while (!(entry = readdir(slots_dir))) {
+	while ((entry = readdir(slots_dir))) {
 		if (entry->d_type == DT_DIR &&
 		    strncmp(entry->d_name, ".", 1) != 0 &&
 		    strncmp(entry->d_name, "..", 2) != 0) {

Original file line number	Diff line number	Diff line change
`@@ -1729,7 +1729,7 @@ static char nvme_ctrl_lookup_phy_slot(nvme_root_t r, const char address)`
`1729`	`1729`	`}`
`1730`	`1730`
`1731`	`1731`	`target_addr = strndup(address, 10);`
`1732`		`- while (!(entry = readdir(slots_dir))) {`
	`1732`	`+ while ((entry = readdir(slots_dir))) {`
`1733`	`1733`	`if (entry->d_type == DT_DIR &&`
`1734`	`1734`	`strncmp(entry->d_name, ".", 1) != 0 &&`
`1735`	`1735`	`strncmp(entry->d_name, "..", 2) != 0) {`