summaryrefslogtreecommitdiffstats
path: root/0147-RHBZ-1272620-fail-rm-msg.patch
diff options
context:
space:
mode:
authorBenjamin Marzinski <bmarzins@redhat.com>2016-04-21 21:27:49 -0500
committerBenjamin Marzinski <bmarzins@redhat.com>2016-04-21 21:27:49 -0500
commit6738b34a0b0aabf1bc8c15d540bafa29ca99c58f (patch)
treecf5a37898b4bacc7fefcc08db661338bfdb9ffec /0147-RHBZ-1272620-fail-rm-msg.patch
parentfef216999bec3651f01b934a3ece5a69f6eca598 (diff)
downloaddevice-mapper-multipath-6738b34a0b0aabf1bc8c15d540bafa29ca99c58f.tar.gz
device-mapper-multipath-6738b34a0b0aabf1bc8c15d540bafa29ca99c58f.tar.xz
device-mapper-multipath-6738b34a0b0aabf1bc8c15d540bafa29ca99c58f.zip
device-mapper-multipath-0.4.9-82
- Modify 0005-RH-add-mpathconf.patch * changed warning message - Modify 0102-RHBZ-1160478-mpathconf-template.patch * updated man page - Modify 0104-RHBZ-631009-deferred-remove.patch * refactor code and minor fix - Refresh 0107-RHBZ-1169935-no-new-devs.patch - Refresh 0112-RHBZ-1194917-add-config_dir-option.patch - Refresh 0126-RHBZ-1211383-alias-collision.patch - Add 0133-RHBZ-1296979-fix-define.patch * look for the correct libudev function to set define - Add 0134-RHBZ-1241528-check-mpath-prefix.patch * only touch devices with a "mpath-" dm uuid prefix - Add 0135-RHBZ-1299600-path-dev-uevents.patch * trigger path uevent the first time a path is claimed by multipath - Add 0136-RHBZ-1304687-wait-for-map-add.patch * wait for the device to finish being added before reloading it. - Add 0137-RHBZ-1280524-clear-chkr-msg.patch - Add 0138-RHBZ-1288660-fix-mpathconf-allow.patch * don't remove existing lines from blacklist_exceptions section - Add 0139-RHBZ-1273173-queue-no-daemon-doc.patch - Add 0140-RHBZ-1299647-fix-help.patch - Add 0141-RHBZ-1303953-mpathpersist-typo.patch - Add 0142-RHBZ-1283750-kpartx-fix.patch * only remove devices if their uuid says that they are the correct partition device - Add 0143-RHBZ-1299648-kpartx-sync.patch * default to using udev sync mode - Add 0144-RHBZ-1299652-alua-pref-arg.patch * allow "exclusive_pref_bit" argument to alua prioritizer - Add 0145-UP-resize-help-msg.patch - Add 0146-UPBZ-1299651-raw-output.patch * allow raw format mutipathd show commands, that remove headers and padding - Add 0147-RHBZ-1272620-fail-rm-msg.patch - Add 0148-RHBZ-1292599-verify-before-remove.patch * verify that all partitions are unused before attempting to remove a device - Add 0149-RHBZ-1292599-restore-removed-parts.patch * don't disable kpartx when restoring the first path of a device. - Add 0150-RHBZ-1253913-fix-startup-msg.patch * wait for multipathd daemon to write pidfile before returning - Add 0151-RHBZ-1297456-weighted-fix.patch * add wwn keyword to weighted prioritizer for persistent naming - Add 0152-RHBZ-1269293-fix-blk-unit-file.patch * use "Wants" instead of "Requires" - Add 0153-RH-fix-i686-size-bug.patch * use 64-bit keycodes for multipathd client commands - Add 0154-UPBZ-1291406-disable-reinstate.patch * don't automatically reinstate ghost paths for implicit alua devices - Add 0155-UPBZ-1300415-PURE-config.patch * Add default config for PURE FlashArray - Add 0156-UPBZ-1313324-dont-fail-discovery.patch * don't fail discovery because individual paths failed. - Add 0157-RHBZ-1319853-multipath-c-error-msg.patch * better error reporting for multipath -c - Add 0158-RHBZ-1318581-timestamp-doc-fix.patch * add documentation for -T - Add 0159-UPBZ-1255885-udev-waits.patch * make multipath and kpartx wait after for udev after each command
Diffstat (limited to '0147-RHBZ-1272620-fail-rm-msg.patch')
-rw-r--r--0147-RHBZ-1272620-fail-rm-msg.patch60
1 files changed, 60 insertions, 0 deletions
diff --git a/0147-RHBZ-1272620-fail-rm-msg.patch b/0147-RHBZ-1272620-fail-rm-msg.patch
new file mode 100644
index 0000000..b48ed6b
--- /dev/null
+++ b/0147-RHBZ-1272620-fail-rm-msg.patch
@@ -0,0 +1,60 @@
+---
+ multipathd/cli_handlers.c | 8 ++++----
+ multipathd/main.c | 4 ++--
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+Index: multipath-tools-130222/multipathd/cli_handlers.c
+===================================================================
+--- multipath-tools-130222.orig/multipathd/cli_handlers.c
++++ multipath-tools-130222/multipathd/cli_handlers.c
+@@ -459,7 +459,7 @@ cli_del_path (void * v, char ** reply, i
+ pp = find_path_by_dev(vecs->pathvec, param);
+ if (!pp) {
+ condlog(0, "%s: path already removed", param);
+- return 0;
++ return 1;
+ }
+ return ev_remove_path(pp, vecs);
+ }
+@@ -520,19 +520,19 @@ cli_del_map (void * v, char ** reply, in
+ minor = dm_get_minor(param);
+ if (minor < 0) {
+ condlog(2, "%s: not a device mapper table", param);
+- return 0;
++ return 1;
+ }
+ major = dm_get_major(param);
+ if (major < 0) {
+ condlog(2, "%s: not a device mapper table", param);
+- return 0;
++ return 1;
+ }
+ sprintf(dev_path,"dm-%d", minor);
+ alias = dm_mapname(major, minor);
+ if (!alias) {
+ condlog(2, "%s: mapname not found for %d:%d",
+ param, major, minor);
+- return 0;
++ return 1;
+ }
+ rc = ev_remove_map(param, alias, minor, vecs);
+ FREE(alias);
+Index: multipath-tools-130222/multipathd/main.c
+===================================================================
+--- multipath-tools-130222.orig/multipathd/main.c
++++ multipath-tools-130222/multipathd/main.c
+@@ -437,12 +437,12 @@ ev_remove_map (char * devname, char * al
+ if (!mpp) {
+ condlog(2, "%s: devmap not registered, can't remove",
+ devname);
+- return 0;
++ return 1;
+ }
+ if (strcmp(mpp->alias, alias)) {
+ condlog(2, "%s: minor number mismatch (map %d, event %d)",
+ mpp->alias, mpp->dmi->minor, minor);
+- return 0;
++ return 1;
+ }
+ return flush_map(mpp, vecs, 0);
+ }