filters: return error code

The scan helpers should also return the error code instead the generic -1.

Fixes: f4c6eee ("rrc: return error codes directly")
Signed-off-by: Daniel Wagner <[email protected]>

Author: igaw

libnvme/src/nvme/filters.c

@@ -78,37 +78,71 @@ int nvme_subsys_filter(const struct dirent *d)
 int nvme_scan_subsystems(struct dirent ***subsys)
 {
 	const char *dir = nvme_subsys_sysfs_dir();
+	int ret;
 
-	return scandir(dir, subsys, nvme_subsys_filter, alphasort);
+	ret = scandir(dir, subsys, nvme_subsys_filter, alphasort);
+	if (ret < 0)
+		return -errno;
+
+	return ret;
 }
 
 int nvme_scan_subsystem_namespaces(nvme_subsystem_t s, struct dirent ***ns)
 {
-	return scandir(nvme_subsystem_get_sysfs_dir(s), ns,
+	int ret;
+
+	ret = scandir(nvme_subsystem_get_sysfs_dir(s), ns,
 		       nvme_namespace_filter, alphasort);
+	if (ret < 0)
+		return -errno;
+
+	return ret;
 }
 
 int nvme_scan_ctrls(struct dirent ***ctrls)
 {
 	const char *dir = nvme_ctrl_sysfs_dir();
+	int ret;
 
-	return scandir(dir, ctrls, nvme_ctrls_filter, alphasort);
+	ret = scandir(dir, ctrls, nvme_ctrls_filter, alphasort);
+	if (ret < 0)
+		return -errno;
+
+	return ret;
 }
 
 int nvme_scan_ctrl_namespace_paths(nvme_ctrl_t c, struct dirent ***paths)
 {
-	return scandir(nvme_ctrl_get_sysfs_dir(c), paths,
+	int ret;
+
+	ret = scandir(nvme_ctrl_get_sysfs_dir(c), paths,
 		       nvme_paths_filter, alphasort);
+	if (ret < 0)
+		return -errno;
+
+	return ret;
 }
 
 int nvme_scan_ctrl_namespaces(nvme_ctrl_t c, struct dirent ***ns)
 {
-	return scandir(nvme_ctrl_get_sysfs_dir(c), ns,
+	int ret;
+
+	ret = scandir(nvme_ctrl_get_sysfs_dir(c), ns,
 		       nvme_namespace_filter, alphasort);
+	if (ret < 0)
+		return -errno;
+
+	return ret;
 }
 
 int nvme_scan_ns_head_paths(nvme_ns_head_t head, struct dirent ***paths)
 {
-	return scandir(nvme_ns_head_get_sysfs_dir(head), paths,
+	int ret;
+
+	ret = scandir(nvme_ns_head_get_sysfs_dir(head), paths,
 		       nvme_paths_filter, alphasort);
+	if (ret < 0)
+		return -errno;
+
+	return ret;
 }

libnvme/src/nvme/filters.h

@@ -55,7 +55,7 @@ int nvme_subsys_filter(const struct dirent *d);
  * nvme_scan_subsystems() - Scan for subsystems
  * @subsys: Pointer to array of dirents
  *
- * Return: number of entries in @subsys
+ * Return: number of entries in @subsys or a negative error code
  */
 int nvme_scan_subsystems(struct dirent ***subsys);
 
@@ -64,15 +64,15 @@ int nvme_scan_subsystems(struct dirent ***subsys);
  * @s: Subsystem to scan
  * @ns: Pointer to array of dirents
  *
- * Return: number of entries in @ns
+ * Return: number of entries in @ns or a negative error code
  */
 int nvme_scan_subsystem_namespaces(nvme_subsystem_t s, struct dirent ***ns);
 
 /**
  * nvme_scan_ctrls() - Scan for controllers
  * @ctrls: Pointer to array of dirents
  *
- * Return: number of entries in @ctrls
+ * Return: number of entries in @ctrls or a negative error code
  */
 int nvme_scan_ctrls(struct dirent ***ctrls);
 
@@ -81,7 +81,7 @@ int nvme_scan_ctrls(struct dirent ***ctrls);
  * @c: Controller to scan
  * @paths: Pointer to array of dirents
  *
- * Return: number of entries in @paths
+ * Return: number of entries in @paths or a negative error code
  */
 int nvme_scan_ctrl_namespace_paths(nvme_ctrl_t c, struct dirent ***paths);
 
@@ -90,7 +90,7 @@ int nvme_scan_ctrl_namespace_paths(nvme_ctrl_t c, struct dirent ***paths);
  * @c: Controller to scan
  * @ns: Pointer to array of dirents
  *
- * Return: number of entries in @ns
+ * Return: number of entries in @ns or a negative error code
  */
 int nvme_scan_ctrl_namespaces(nvme_ctrl_t c, struct dirent ***ns);
 
@@ -99,7 +99,7 @@ int nvme_scan_ctrl_namespaces(nvme_ctrl_t c, struct dirent ***ns);
  * @head: Namespace head node to scan
  * @paths : Pointer to array of dirents
  *
- * Return: number of entries in @ents
+ * Return: number of entries in @ents or a negative error code
  */
 int nvme_scan_ns_head_paths(nvme_ns_head_t head, struct dirent ***paths);