Skip to content

Commit 283585a

Browse files
committed
nvme: do not issue warning when nvme_core module is not loaded
nvme 1.x did not issue an warning when the nvme_core module was not loaded. Make 2.x behave in the same way. Signed-off-by: Daniel Wagner <dwagner@suse.de>
1 parent bd56678 commit 283585a

File tree

2 files changed

+24
-15
lines changed

2 files changed

+24
-15
lines changed

fabrics.c

+18-12
Original file line numberDiff line numberDiff line change
@@ -728,8 +728,9 @@ int nvmf_discover(const char *desc, int argc, char **argv, bool connect)
728728
nvme_root_set_application(r, context);
729729
ret = nvme_scan_topology(r, NULL, NULL);
730730
if (ret < 0) {
731-
fprintf(stderr, "Failed to scan topology: %s\n",
732-
nvme_strerror(errno));
731+
if (errno != ENOENT)
732+
fprintf(stderr, "Failed to scan topology: %s\n",
733+
nvme_strerror(errno));
733734
nvme_free_tree(r);
734735
return ret;
735736
}
@@ -958,8 +959,9 @@ int nvmf_connect(const char *desc, int argc, char **argv)
958959
nvme_root_set_application(r, context);
959960
ret = nvme_scan_topology(r, NULL, NULL);
960961
if (ret < 0) {
961-
fprintf(stderr, "Failed to scan topology: %s\n",
962-
nvme_strerror(errno));
962+
if (errno != ENOENT)
963+
fprintf(stderr, "Failed to scan topology: %s\n",
964+
nvme_strerror(errno));
963965
nvme_free_tree(r);
964966
return ret;
965967
}
@@ -1118,8 +1120,9 @@ int nvmf_disconnect(const char *desc, int argc, char **argv)
11181120
}
11191121
ret = nvme_scan_topology(r, NULL, NULL);
11201122
if (ret < 0) {
1121-
fprintf(stderr, "Failed to scan topology: %s\n",
1122-
nvme_strerror(errno));
1123+
if (errno != ENOENT)
1124+
fprintf(stderr, "Failed to scan topology: %s\n",
1125+
nvme_strerror(errno));
11231126
nvme_free_tree(r);
11241127
return ret;
11251128
}
@@ -1188,8 +1191,9 @@ int nvmf_disconnect_all(const char *desc, int argc, char **argv)
11881191
}
11891192
ret = nvme_scan_topology(r, NULL, NULL);
11901193
if (ret < 0) {
1191-
fprintf(stderr, "Failed to scan topology: %s\n",
1192-
nvme_strerror(errno));
1194+
if (errno != ENOENT)
1195+
fprintf(stderr, "Failed to scan topology: %s\n",
1196+
nvme_strerror(errno));
11931197
nvme_free_tree(r);
11941198
return ret;
11951199
}
@@ -1259,8 +1263,9 @@ int nvmf_config(const char *desc, int argc, char **argv)
12591263
if (scan_tree) {
12601264
ret = nvme_scan_topology(r, NULL, NULL);
12611265
if (ret < 0) {
1262-
fprintf(stderr, "Failed to scan topology: %s\n",
1263-
nvme_strerror(errno));
1266+
if (errno != ENOENT)
1267+
fprintf(stderr, "Failed to scan topology: %s\n",
1268+
nvme_strerror(errno));
12641269
nvme_free_tree(r);
12651270
return ret;
12661271
}
@@ -1412,8 +1417,9 @@ int nvmf_dim(const char *desc, int argc, char **argv)
14121417
}
14131418
ret = nvme_scan_topology(r, NULL, NULL);
14141419
if (ret < 0) {
1415-
fprintf(stderr, "Failed to scan topology: %s\n",
1416-
nvme_strerror(errno));
1420+
if (errno != ENOENT)
1421+
fprintf(stderr, "Failed to scan topology: %s\n",
1422+
nvme_strerror(errno));
14171423
nvme_free_tree(r);
14181424
return ret;
14191425
}

nvme.c

+6-3
Original file line numberDiff line numberDiff line change
@@ -3248,7 +3248,8 @@ static int list_subsys(int argc, char **argv, struct command *cmd,
32483248

32493249
err = nvme_scan_topology(r, filter, (void *)devname);
32503250
if (err) {
3251-
nvme_show_error("Failed to scan topology: %s", nvme_strerror(errno));
3251+
if (errno != ENOENT)
3252+
nvme_show_error("Failed to scan topology: %s", nvme_strerror(errno));
32523253
goto ret;
32533254
}
32543255

@@ -3289,7 +3290,8 @@ static int list(int argc, char **argv, struct command *cmd, struct plugin *plugi
32893290
}
32903291
err = nvme_scan_topology(r, NULL, NULL);
32913292
if (err < 0) {
3292-
nvme_show_error("Failed to scan topology: %s", nvme_strerror(errno));
3293+
if (errno != ENOENT)
3294+
nvme_show_error("Failed to scan topology: %s", nvme_strerror(errno));
32933295
nvme_free_tree(r);
32943296
return err;
32953297
}
@@ -8871,7 +8873,8 @@ static int show_topology_cmd(int argc, char **argv, struct command *command, str
88718873

88728874
err = nvme_scan_topology(r, NULL, NULL);
88738875
if (err < 0) {
8874-
nvme_show_error("Failed to scan topology: %s", nvme_strerror(errno));
8876+
if (errno != ENOENT)
8877+
nvme_show_error("Failed to scan topology: %s", nvme_strerror(errno));
88758878
nvme_free_tree(r);
88768879
return err;
88778880
}

0 commit comments

Comments
 (0)