From owner-svn-src-all@FreeBSD.ORG  Sat Aug 25 10:36:32 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 69F44106566C;
	Sat, 25 Aug 2012 10:36:32 +0000 (UTC)
	(envelope-from thomas@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 548B98FC0A;
	Sat, 25 Aug 2012 10:36:32 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7PAaW6o024829;
	Sat, 25 Aug 2012 10:36:32 GMT (envelope-from thomas@svn.freebsd.org)
Received: (from thomas@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7PAaWhi024826;
	Sat, 25 Aug 2012 10:36:32 GMT (envelope-from thomas@svn.freebsd.org)
Message-Id: <201208251036.q7PAaWhi024826@svn.freebsd.org>
From: Thomas Quinot <thomas@FreeBSD.org>
Date: Sat, 25 Aug 2012 10:36:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r239673 - head/sys/geom/multipath
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 25 Aug 2012 10:36:32 -0000

Author: thomas
Date: Sat Aug 25 10:36:31 2012
New Revision: 239673
URL: http://svn.freebsd.org/changeset/base/239673

Log:
  (g_multipath_rotate): Fix algorithm so that it does rotate over all good
  providers, not just the last two.
  
  PR:		kern/170379
  Reviewed by:	mav
  MFC after:	2 weeks

Modified:
  head/sys/geom/multipath/g_multipath.c

Modified: head/sys/geom/multipath/g_multipath.c
==============================================================================
--- head/sys/geom/multipath/g_multipath.c	Sat Aug 25 09:26:37 2012	(r239672)
+++ head/sys/geom/multipath/g_multipath.c	Sat Aug 25 10:36:31 2012	(r239673)
@@ -590,19 +590,26 @@ g_multipath_destroy_geom(struct gctl_req
 static int
 g_multipath_rotate(struct g_geom *gp)
 {
-	struct g_consumer *lcp;
+	struct g_consumer *lcp, *first_good_cp = NULL;
 	struct g_multipath_softc *sc = gp->softc;
+	int active_cp_seen = 0;
 
 	g_topology_assert();
 	if (sc == NULL)
 		return (ENXIO);
 	LIST_FOREACH(lcp, &gp->consumer, consumer) {
 		if ((lcp->index & MP_BAD) == 0) {
-			if (sc->sc_active != lcp)
+			if (first_good_cp == NULL)
+				first_good_cp = lcp;
+			if (active_cp_seen)
 				break;
 		}
+		if (sc->sc_active == lcp)
+			active_cp_seen = 1;
 	}
-	if (lcp) {
+	if (lcp == NULL)
+		lcp = first_good_cp;
+	if (lcp && lcp != sc->sc_active) {
 		sc->sc_active = lcp;
 		if (sc->sc_active_active != 1)
 			printf("GEOM_MULTIPATH: %s is now active path in %s\n",