|
|
4728c8 |
---
|
|
|
4728c8 |
multipathd/cli_handlers.c | 8 ++++----
|
|
|
4728c8 |
multipathd/main.c | 4 ++--
|
|
|
4728c8 |
2 files changed, 6 insertions(+), 6 deletions(-)
|
|
|
4728c8 |
|
|
|
4728c8 |
Index: multipath-tools-130222/multipathd/cli_handlers.c
|
|
|
4728c8 |
===================================================================
|
|
|
4728c8 |
--- multipath-tools-130222.orig/multipathd/cli_handlers.c
|
|
|
4728c8 |
+++ multipath-tools-130222/multipathd/cli_handlers.c
|
|
|
4728c8 |
@@ -459,7 +459,7 @@ cli_del_path (void * v, char ** reply, i
|
|
|
4728c8 |
pp = find_path_by_dev(vecs->pathvec, param);
|
|
|
4728c8 |
if (!pp) {
|
|
|
4728c8 |
condlog(0, "%s: path already removed", param);
|
|
|
4728c8 |
- return 0;
|
|
|
4728c8 |
+ return 1;
|
|
|
4728c8 |
}
|
|
|
4728c8 |
return ev_remove_path(pp, vecs);
|
|
|
4728c8 |
}
|
|
|
4728c8 |
@@ -520,19 +520,19 @@ cli_del_map (void * v, char ** reply, in
|
|
|
4728c8 |
minor = dm_get_minor(param);
|
|
|
4728c8 |
if (minor < 0) {
|
|
|
4728c8 |
condlog(2, "%s: not a device mapper table", param);
|
|
|
4728c8 |
- return 0;
|
|
|
4728c8 |
+ return 1;
|
|
|
4728c8 |
}
|
|
|
4728c8 |
major = dm_get_major(param);
|
|
|
4728c8 |
if (major < 0) {
|
|
|
4728c8 |
condlog(2, "%s: not a device mapper table", param);
|
|
|
4728c8 |
- return 0;
|
|
|
4728c8 |
+ return 1;
|
|
|
4728c8 |
}
|
|
|
4728c8 |
sprintf(dev_path,"dm-%d", minor);
|
|
|
4728c8 |
alias = dm_mapname(major, minor);
|
|
|
4728c8 |
if (!alias) {
|
|
|
4728c8 |
condlog(2, "%s: mapname not found for %d:%d",
|
|
|
4728c8 |
param, major, minor);
|
|
|
4728c8 |
- return 0;
|
|
|
4728c8 |
+ return 1;
|
|
|
4728c8 |
}
|
|
|
4728c8 |
rc = ev_remove_map(param, alias, minor, vecs);
|
|
|
4728c8 |
FREE(alias);
|
|
|
4728c8 |
Index: multipath-tools-130222/multipathd/main.c
|
|
|
4728c8 |
===================================================================
|
|
|
4728c8 |
--- multipath-tools-130222.orig/multipathd/main.c
|
|
|
4728c8 |
+++ multipath-tools-130222/multipathd/main.c
|
|
|
4728c8 |
@@ -437,12 +437,12 @@ ev_remove_map (char * devname, char * al
|
|
|
4728c8 |
if (!mpp) {
|
|
|
4728c8 |
condlog(2, "%s: devmap not registered, can't remove",
|
|
|
4728c8 |
devname);
|
|
|
4728c8 |
- return 0;
|
|
|
4728c8 |
+ return 1;
|
|
|
4728c8 |
}
|
|
|
4728c8 |
if (strcmp(mpp->alias, alias)) {
|
|
|
4728c8 |
condlog(2, "%s: minor number mismatch (map %d, event %d)",
|
|
|
4728c8 |
mpp->alias, mpp->dmi->minor, minor);
|
|
|
4728c8 |
- return 0;
|
|
|
4728c8 |
+ return 1;
|
|
|
4728c8 |
}
|
|
|
4728c8 |
return flush_map(mpp, vecs, 0);
|
|
|
4728c8 |
}
|