From patchwork Fri Jan 21 16:57:45 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: 495991
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 p0LH0VP0025437
	for <patchwork-dm-devel@patchwork.kernel.org>;
	Fri, 21 Jan 2011 17:00:53 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 p0LGw1Gt018314;
	Fri, 21 Jan 2011 11:58:02 -0500
Received: from int-mx09.intmail.prod.int.phx2.redhat.com
	(int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with
	ESMTP id p0LGw0hP026536 for <dm-devel@listman.util.phx.redhat.com>;
	Fri, 21 Jan 2011 11:58:00 -0500
Received: from mx1.redhat.com (ext-mx09.extmail.prod.ext.phx2.redhat.com
	[10.5.110.13])
	by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with
	ESMTP id p0LGvt8Y009246
	for <dm-devel@redhat.com>; Fri, 21 Jan 2011 11:57:55 -0500
Received: from sourceware.org (server1.sourceware.org [209.132.180.131])
	by mx1.redhat.com (8.13.8/8.13.8) with SMTP id p0LGvjCp027948
	for <dm-devel@redhat.com>; Fri, 21 Jan 2011 11:57:45 -0500
Received: (qmail 25365 invoked by uid 9475); 21 Jan 2011 16:57:45 -0000
Date: 21 Jan 2011 16:57:45 -0000
Message-ID: <20110121165745.25363.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.68 on 10.5.11.22
X-Scanned-By: MIMEDefang 2.67 on 10.5.110.13
X-loop: dm-devel@redhat.com
Subject: [dm-devel] multipath-tools ./multipath.conf.defaults libm ...
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]);
	Fri, 21 Jan 2011 17:00:53 +0000 (UTC)


--- multipath-tools/multipath.conf.defaults	2009/09/11 15:19:50	1.5.2.13
+++ multipath-tools/multipath.conf.defaults	2011/01/21 16:57:43	1.5.2.14
@@ -87,9 +87,9 @@
 #               vendor                  "HP"
 #               product                 "HSVX700"
 #               path_grouping_policy    group_by_prio
-#               prio_callout            "/sbin/mpath_prio_alua /dev/%n"
-#		hardware_handler	"1 alua"
-#               path_checker            tur
+#               prio_callout            "/sbin/mpath_prio_hp_sw /dev/%n"
+#		hardware_handler	"0"
+#               path_checker            hp_sw
 #		failback		immediate
 #               no_path_retry           12
 #		rr_min_io		100
--- multipath-tools/libmultipath/hwtable.c	2010/10/27 18:55:55	1.16.2.18
+++ multipath-tools/libmultipath/hwtable.c	2011/01/21 16:57:44	1.16.2.19
@@ -54,10 +54,6 @@
 			   GROUP_BY_PRIO, DEFAULT_GETUID,
 			   "/sbin/mpath_prio_alua /dev/%n", "0", "0", "tur",
 			   -FAILBACK_IMMEDIATE, NULL, 18, 0, 100);
-        r += store_hwe_ext(hw, "HP", "HSVX700",
-			   GROUP_BY_PRIO, DEFAULT_GETUID,
-			   "/sbin/mpath_prio_alua /dev/%n", "1 alua", "0",
-			   "tur", -FAILBACK_IMMEDIATE, NULL, 12, 0, 100);
 	r += store_hwe_ext(hw, "HP", "MSA2000s*", MULTIBUS, "/sbin/cciss_id %n",
 	                   NULL, "0", "0", "cciss_tur", FAILBACK_UNDEF, NULL,
 	                   12, 0, 0);