From patchwork Wed Feb 16 19:00:53 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: bmarzins@sourceware.org
X-Patchwork-Id: 568171
Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p1GJ3dDi006521
	for <patchwork-dm-devel@patchwork.kernel.org>;
	Wed, 16 Feb 2011 19:04:00 GMT
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
	(lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p1GJ1998009350;
	Wed, 16 Feb 2011 14:01:10 -0500
Received: from int-mx01.intmail.prod.int.phx2.redhat.com
	(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with
	ESMTP id p1GJ18R0024615 for <dm-devel@listman.util.phx.redhat.com>;
	Wed, 16 Feb 2011 14:01:08 -0500
Received: from mx1.redhat.com (ext-mx12.extmail.prod.ext.phx2.redhat.com
	[10.5.110.17])
	by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with
	ESMTP id p1GJ12Or021348
	for <dm-devel@redhat.com>; Wed, 16 Feb 2011 14:01:02 -0500
Received: from sourceware.org (server1.sourceware.org [209.132.180.131])
	by mx1.redhat.com (8.14.4/8.14.4) with SMTP id p1GJ0rf4026958
	for <dm-devel@redhat.com>; Wed, 16 Feb 2011 14:00:53 -0500
Received: (qmail 12946 invoked by uid 9475); 16 Feb 2011 19:00:53 -0000
Date: 16 Feb 2011 19:00:53 -0000
Message-ID: <20110216190053.12944.qmail@sourceware.org>
From: bmarzins@sourceware.org
To: dm-cvs@sourceware.org, dm-devel@redhat.com
X-RedHat-Spam-Score: -2.31  (RCVD_IN_DNSWL_MED,T_RP_MATCHES_RCVD)
X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11
X-Scanned-By: MIMEDefang 2.68 on 10.5.110.17
X-loop: dm-devel@redhat.com
Subject: [dm-devel] multipath-tools/libmultipath configure.c struc ...
X-BeenThere: dm-devel@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
Reply-To: device-mapper development <dm-devel@redhat.com>
List-Id: device-mapper development <dm-devel.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/dm-devel>,
	<mailto:dm-devel-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/dm-devel>
List-Post: <mailto:dm-devel@redhat.com>
List-Help: <mailto:dm-devel-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/dm-devel>,
	<mailto:dm-devel-request@redhat.com?subject=subscribe>
MIME-Version: 1.0
Sender: dm-devel-bounces@redhat.com
Errors-To: dm-devel-bounces@redhat.com
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]);
	Wed, 16 Feb 2011 19:04:00 +0000 (UTC)


--- multipath-tools/libmultipath/configure.c	2010/06/23 16:28:07	1.2.2.9
+++ multipath-tools/libmultipath/configure.c	2011/02/16 19:00:51	1.2.2.10
@@ -77,7 +77,7 @@
 	if (mpp->pgpolicyfn && mpp->pgpolicyfn(mpp))
 		return 1;
 
-	mpp->nr_active = pathcount(mpp, PATH_UP);
+	mpp->nr_active = pathcount(mpp, PATH_UP) + pathcount(mpp, PATH_GHOST);
 
 	/*
 	 * ponders each path group and determine highest prio pg
--- multipath-tools/libmultipath/structs_vec.c	2010/06/23 16:28:07	1.1.2.5
+++ multipath-tools/libmultipath/structs_vec.c	2011/02/16 19:00:51	1.1.2.6
@@ -285,7 +285,8 @@
 	}
 
 	//adopt_paths(vecs->pathvec, mpp);
-	mpp->hwe = extract_hwe_from_path(mpp);
+	if (!mpp->hwe)
+		mpp->hwe = extract_hwe_from_path(mpp);
 	select_rr_weight(mpp);
 	select_pgfailback(mpp);
 	set_no_path_retry(mpp);