3f562fdb0b
Add 0111-RH-dont-show-pg-timeout.patch
* The kernel doesn't support pg_timeout, so multipath shouldn't
bother to display it
Add 0112-RHBZ-1194917-add-config_dir-option.patch
* multipath will now also read its configuration from files with
the .conf suffix in the directory specified by config_dir
which defaults to /etc/multipath/conf.d
Add 0113-RHBZ-1194917-cleanup.patch
* cleanup some unnecessary code
Add 0114-RHBZ-1196394-delayed-reintegration.patch
* Add "delay_watch_checks" and "delay_wait_checks" options to delay
reintegration of flakey paths.
Add 0115-RHBZ-1198418-fix-double-free.patch
* multipath was freeing the multipath alias twice if it failed to create the
multipath device.
Add 0116-UPBZ-1188179-dell-36xxi.patch
* new builtin configurations.
Add 0117-RHBZ-1198424-autodetect-clariion-alua.patch
* configure multipath to automatically detect alua settings on clariion
devices.
29 lines
883 B
Diff
29 lines
883 B
Diff
---
|
|
multipathd/main.c | 13 +++++++++----
|
|
1 file changed, 9 insertions(+), 4 deletions(-)
|
|
|
|
Index: multipath-tools-130222/multipathd/main.c
|
|
===================================================================
|
|
--- multipath-tools-130222.orig/multipathd/main.c
|
|
+++ multipath-tools-130222/multipathd/main.c
|
|
@@ -310,10 +310,15 @@ ev_add_map (char * dev, char * alias, st
|
|
/*
|
|
* now we can register the map
|
|
*/
|
|
- if (map_present && (mpp = add_map_without_path(vecs, alias))) {
|
|
- sync_map_state(mpp);
|
|
- condlog(2, "%s: devmap %s registered", alias, dev);
|
|
- return 0;
|
|
+ if (map_present) {
|
|
+ if ((mpp = add_map_without_path(vecs, alias))) {
|
|
+ sync_map_state(mpp);
|
|
+ condlog(2, "%s: devmap %s registered", alias, dev);
|
|
+ return 0;
|
|
+ } else {
|
|
+ condlog(2, "%s: uev_add_map failed", dev);
|
|
+ return 1;
|
|
+ }
|
|
}
|
|
r = get_refwwid(dev, DEV_DEVMAP, vecs->pathvec, &refwwid);
|
|
|