[dm-devel] multipath-tools/multipathd main.c

[bmarzins at sourceware.org]

CVSROOT:	/cvs/dm
Module name:	multipath-tools
Branch: 	RHEL5_FC6
Changes by:	bmarzins at sourceware.org	2011-10-10 03:47:07

Modified files:
	multipathd     : main.c 

Log message:
	Fix for BZ# 655976. Don't automatically update path groups on devices set to
	manual failback when the prio changes.  This fix is already upstream.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/multipath-tools/multipathd/main.c.diff?cvsroot=dm&only_with_tag=RHEL5_FC6&r1=1.69.2.35&r2=1.69.2.36

--- multipath-tools/multipathd/main.c	2011/04/11 17:01:08	1.69.2.35
+++ multipath-tools/multipathd/main.c	2011/10/10 03:47:07	1.69.2.36
@@ -1153,8 +1153,7 @@
 			 * path prio refreshing
 			 */
 			condlog(4, "path prio refresh");
-			if (update_prio(pp, new_path_up) &&
-			    pp->mpp->pgpolicyfn == (pgpolicyfn *)group_by_prio)
+			if (update_prio(pp, new_path_up) && pp->mpp->pgpolicyfn == (pgpolicyfn *)group_by_prio && (pp->mpp->pgfailback == -FAILBACK_IMMEDIATE || pp->mpp->pgfailback > 0))
 				update_path_groups(pp->mpp, vecs, !new_path_up);
 			else if (need_switch_pathgroup(pp->mpp, 0)) {
 				if (pp->mpp->pgfailback > 0 &&