From patchwork Mon Mar 30 06:23:23 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hannes Reinecke X-Patchwork-Id: 6118601 X-Patchwork-Delegate: christophe.varoqui@free.fr Return-Path: X-Original-To: patchwork-dm-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id BDB65BF4A7 for ; Mon, 30 Mar 2015 06:27:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E2E62203B7 for ; Mon, 30 Mar 2015 06:27:47 +0000 (UTC) Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D07AF203AD for ; Mon, 30 Mar 2015 06:27:46 +0000 (UTC) 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 t2U6NVvb025748; Mon, 30 Mar 2015 02:23:32 -0400 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 t2U6NUKU023348 for ; Mon, 30 Mar 2015 02:23:30 -0400 Received: from mx1.redhat.com (ext-mx13.extmail.prod.ext.phx2.redhat.com [10.5.110.18]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t2U6NUoh005443 for ; Mon, 30 Mar 2015 02:23:30 -0400 Received: from mx2.suse.de (cantor2.suse.de [195.135.220.15]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t2U6NQNq015136 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL) for ; Mon, 30 Mar 2015 02:23:27 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 122D1ACA9; Mon, 30 Mar 2015 06:23:26 +0000 (UTC) From: Hannes Reinecke To: Christophe Varoqui Date: Mon, 30 Mar 2015 08:23:23 +0200 Message-Id: <1427696603-15184-2-git-send-email-hare@suse.de> In-Reply-To: <1427696603-15184-1-git-send-email-hare@suse.de> References: <1427696603-15184-1-git-send-email-hare@suse.de> X-RedHat-Spam-Score: -6.909 (BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, URIBL_BLOCKED) 195.135.220.15 cantor2.suse.de 195.135.220.15 cantor2.suse.de X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Scanned-By: MIMEDefang 2.68 on 10.5.110.18 X-loop: dm-devel@redhat.com Cc: dm-devel@redhat.com, Xose Vazquez Perez Subject: [dm-devel] [PATCH 2/2] Merge Dell MD3XXX hardware table entries X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk Reply-To: device-mapper development List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Remove duplicate entries and merge MD36xxi/MD36xxf into a single one. Signed-off-by: Hannes Reinecke --- libmultipath/hwtable.c | 53 ++++---------------------------------------------- 1 file changed, 4 insertions(+), 49 deletions(-) diff --git a/libmultipath/hwtable.c b/libmultipath/hwtable.c index fa4b20f..f83f3e7 100644 --- a/libmultipath/hwtable.c +++ b/libmultipath/hwtable.c @@ -728,7 +728,7 @@ static struct hwentry default_hw[] = { .prio_args = NULL, }, { - /* DELL MD3000 */ + /* DELL MD3000/MD3000i */ .vendor = "DELL", .product = "MD3000", .bl_product = "Universal Xport", @@ -743,22 +743,7 @@ static struct hwentry default_hw[] = { .prio_args = NULL, }, { - /* DELL MD3000i */ - .vendor = "DELL", - .product = "MD3000i", - .bl_product = "Universal Xport", - .features = "2 pg_init_retries 50", - .hwhandler = "1 rdac", - .pgpolicy = GROUP_BY_PRIO, - .pgfailback = -FAILBACK_IMMEDIATE, - .rr_weight = RR_WEIGHT_NONE, - .no_path_retry = 15, - .checker_name = RDAC, - .prio_name = PRIO_RDAC, - .prio_args = NULL, - }, - { - /* DELL MD32xx */ + /* DELL MD32xx/MD32xxi */ .vendor = "DELL", .product = "MD32xx", .bl_product = "Universal Xport", @@ -773,39 +758,9 @@ static struct hwentry default_hw[] = { .prio_args = NULL, }, { - /* DELL MD32xxi */ - .vendor = "DELL", - .product = "MD32xxi", - .bl_product = "Universal Xport", - .features = "2 pg_init_retries 50", - .hwhandler = "1 rdac", - .pgpolicy = GROUP_BY_PRIO, - .pgfailback = -FAILBACK_IMMEDIATE, - .rr_weight = RR_WEIGHT_NONE, - .no_path_retry = 15, - .checker_name = RDAC, - .prio_name = PRIO_RDAC, - .prio_args = NULL, - }, - { - /* DELL MD36xxi */ - .vendor = "DELL", - .product = "MD36xxi", - .bl_product = "Universal Xport", - .features = "2 pg_init_retries 50", - .hwhandler = "1 rdac", - .pgpolicy = GROUP_BY_PRIO, - .pgfailback = -FAILBACK_IMMEDIATE, - .rr_weight = RR_WEIGHT_NONE, - .no_path_retry = 15, - .checker_name = RDAC, - .prio_name = PRIO_RDAC, - .prio_args = NULL, - }, - { - /* DELL MD36xxf */ + /* DELL MD36xxi/MD36xxf */ .vendor = "DELL", - .product = "MD36xxf", + .product = "MD36xx(i|f)", .bl_product = "Universal Xport", .features = "2 pg_init_retries 50", .hwhandler = "1 rdac",