efd38c93e9
Modify multipath.conf
* remove getuid_callout example
Re-add 0050-RH-listing-speedup.patch
Add 0081-RHBZ-1066264-check-prefix-on-rename.patch
* make multipath check the prefix on kpartx partitions during rename, and
copy the existing behaviour
Add 0082-UPBZ-1109995-no-sync-turs-on-pthread_cancel.patch
* If async tur checker fails on threads, don't retry with the sync version
Add 0083-RHBZ-1080055-orphan-paths-on-reload.patch
* Fix case where pathlist wasn't getting updated properly
Add 0084-RHBZ-1110000-multipath-man.patch
* fix errors in multipath man page
Add 0085-UPBZ-1110006-datacore-config.patch
* Add support for DataCore Virtual Disk
Add 0086-RHBZ-1110007-orphan-path-on-failed-add.patch
* If multipathd fails to add path correctly, it now fully orphans the path
Add 0087-RHBZ-1110013-config-error-checking.patch
* Improve multipath.conf error checking.
Add 0088-RHBZ-1069811-configurable-prio-timeout.patch
* checker_timeout now adjusts the timeouts of the prioritizers as well.
Add 0089-RHBZ-1110016-add-noasync-option.patch
* Add a new defaults option, "force_sync", that disables the async mode
of the path checkers. This is for cases where to many parallel checkers
hog the cpu
Add 0090-UPBZ-1080038-reorder-paths-for-round-robin.patch
* make multipathd order paths for better throughput in round-robin mode
Add 0091-RHBZ-1069584-fix-empty-values-fast-io-fail-and-dev-loss.patch
* check for null pointers in configuration reading code.
Add 0092-UPBZ-1104605-reload-on-rename.patch
* Reload table on rename if necessary
Add 0093-UPBZ-1086825-user-friendly-name-remap.patch
* Keep existing user_friend_name if possible
Add 0094-RHBZ-1086825-cleanup-remap.patch
* Cleanup issues with upstream patch
Add 0095-RHBZ-1127944-xtremIO-config.patch
* Add support for EMC ExtremIO devices
Add 0096-RHBZ-979474-new-wildcards.patch
* Add N, n, R, and r path wildcards to print World Wide ids
Add 0097-RH-fix-coverity-errors.patch
* Fix a number of unterminated strings and memory leaks on failure
paths.
Add 0098-UPBZ-1067171-mutipath-i.patch
* Add -i option to ignore wwids file when checking for valid paths
Add 0099-RH-add-all-devs.patch
* Add new devices config option all_devs. This makes the configuration
overwrite the specified values in all builtin configs
Add 0100-RHBZ-1067171-multipath-i-update.patch
* make -i work correctly with find_multipaths
Add 0101-RH-adapter-name-wildcard.patch
* Add 'a' path wildcard to print adapter name
108 lines
3.0 KiB
Diff
108 lines
3.0 KiB
Diff
---
|
|
libmultipath/alias.c | 31 +++++++++++++++----------------
|
|
libmultipath/propsel.c | 4 ++--
|
|
2 files changed, 17 insertions(+), 18 deletions(-)
|
|
|
|
Index: multipath-tools-130222/libmultipath/alias.c
|
|
===================================================================
|
|
--- multipath-tools-130222.orig/libmultipath/alias.c
|
|
+++ multipath-tools-130222/libmultipath/alias.c
|
|
@@ -149,13 +149,11 @@ rlookup_binding(FILE *f, char *buff, cha
|
|
{
|
|
char line[LINE_MAX];
|
|
unsigned int line_nr = 0;
|
|
- int id = 0;
|
|
|
|
buff[0] = '\0';
|
|
|
|
while (fgets(line, LINE_MAX, f)) {
|
|
char *c, *alias, *wwid;
|
|
- int curr_id;
|
|
|
|
line_nr++;
|
|
c = strpbrk(line, "#\n\r");
|
|
@@ -164,9 +162,6 @@ rlookup_binding(FILE *f, char *buff, cha
|
|
alias = strtok(line, " \t");
|
|
if (!alias) /* blank line */
|
|
continue;
|
|
- curr_id = scan_devname(alias, prefix);
|
|
- if (curr_id >= id)
|
|
- id = curr_id + 1;
|
|
wwid = strtok(NULL, " \t");
|
|
if (!wwid){
|
|
condlog(3,
|
|
@@ -184,16 +179,12 @@ rlookup_binding(FILE *f, char *buff, cha
|
|
"\nSetting wwid to %s", alias, wwid);
|
|
strncpy(buff, wwid, WWID_SIZE);
|
|
buff[WWID_SIZE - 1] = '\0';
|
|
- return id;
|
|
+ return 0;
|
|
}
|
|
}
|
|
condlog(3, "No matching alias [%s] in bindings file.", map_alias);
|
|
|
|
- /* Get the theoretical id for this map alias.
|
|
- * Used by use_existing_alias
|
|
- */
|
|
- id = scan_devname(map_alias, prefix);
|
|
- return id;
|
|
+ return -1;
|
|
}
|
|
|
|
static char *
|
|
@@ -264,9 +255,7 @@ use_existing_alias (char *wwid, char *fi
|
|
/* lookup the binding. if it exsists, the wwid will be in buff
|
|
* either way, id contains the id for the alias
|
|
*/
|
|
- id = rlookup_binding(f , buff, alias_old, prefix);
|
|
- if (id < 0)
|
|
- goto out;
|
|
+ rlookup_binding(f, buff, alias_old, prefix);
|
|
|
|
if (strlen(buff) > 0) {
|
|
/* if buff is our wwid, it's already
|
|
@@ -279,11 +268,21 @@ use_existing_alias (char *wwid, char *fi
|
|
condlog(0, "alias %s already bound to wwid %s, cannot reuse",
|
|
alias_old, buff);
|
|
}
|
|
- goto out;
|
|
+ goto out;
|
|
}
|
|
|
|
/* allocate the existing alias in the bindings file */
|
|
- if (can_write && id && !bindings_read_only) {
|
|
+ id = scan_devname(alias_old, prefix);
|
|
+ if (id <= 0)
|
|
+ goto out;
|
|
+
|
|
+ if (fflush(f) != 0) {
|
|
+ condlog(0, "cannot fflush bindings file stream : %s",
|
|
+ strerror(errno));
|
|
+ goto out;
|
|
+ }
|
|
+
|
|
+ if (can_write && !bindings_read_only) {
|
|
alias = allocate_binding(fd, wwid, id, prefix);
|
|
condlog(0, "Allocated existing binding [%s] for WWID [%s]",
|
|
alias, wwid);
|
|
Index: multipath-tools-130222/libmultipath/propsel.c
|
|
===================================================================
|
|
--- multipath-tools-130222.orig/libmultipath/propsel.c
|
|
+++ multipath-tools-130222/libmultipath/propsel.c
|
|
@@ -263,13 +263,13 @@ select_alias (struct multipath * mp)
|
|
goto out;
|
|
|
|
select_alias_prefix(mp);
|
|
-
|
|
+
|
|
if (strlen(mp->alias_old) > 0) {
|
|
mp->alias = use_existing_alias(mp->wwid, conf->bindings_file,
|
|
mp->alias_old, mp->alias_prefix,
|
|
conf->bindings_read_only);
|
|
memset (mp->alias_old, 0, WWID_SIZE);
|
|
- }
|
|
+ }
|
|
|
|
if (mp->alias == NULL)
|
|
mp->alias = get_user_friendly_alias(mp->wwid,
|