From patchwork Mon Jun 18 09:54:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Wilck X-Patchwork-Id: 10470613 X-Patchwork-Delegate: christophe.varoqui@free.fr Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B26D76020C for ; Mon, 18 Jun 2018 09:55:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A1C082899B for ; Mon, 18 Jun 2018 09:55:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 968D1289A0; Mon, 18 Jun 2018 09:55:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 35A1C2899B for ; Mon, 18 Jun 2018 09:55:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 00916FECD; Mon, 18 Jun 2018 09:55:24 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C3345308BDB3; Mon, 18 Jun 2018 09:55:23 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 654EA3FCC2; Mon, 18 Jun 2018 09:55:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w5I9tLv8031097 for ; Mon, 18 Jun 2018 05:55:21 -0400 Received: by smtp.corp.redhat.com (Postfix) id B9331608FA; Mon, 18 Jun 2018 09:55:21 +0000 (UTC) Delivered-To: dm-devel@redhat.com Received: from mx1.redhat.com (ext-mx09.extmail.prod.ext.phx2.redhat.com [10.5.110.38]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 44B6B608F6; Mon, 18 Jun 2018 09:55:15 +0000 (UTC) Received: from smtp2.provo.novell.com (smtp2.provo.novell.com [137.65.250.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 447984E915; Mon, 18 Jun 2018 09:55:14 +0000 (UTC) Received: from apollon.suse.de.de (prv-ext-foundry1int.gns.novell.com [137.65.251.240]) by smtp2.provo.novell.com with ESMTP (TLS encrypted); Mon, 18 Jun 2018 03:55:02 -0600 From: Martin Wilck To: Benjamin Marzinski Date: Mon, 18 Jun 2018 11:54:36 +0200 Message-Id: <20180618095436.22352-2-mwilck@suse.com> In-Reply-To: <20180618095436.22352-1-mwilck@suse.com> References: <20180615180332.GL3103@octiron.msp.redhat.com> <20180618095436.22352-1-mwilck@suse.com> X-Greylist: Sender passed SPF test, Sender IP whitelisted by DNSRBL, ACL 207 matched, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Mon, 18 Jun 2018 09:55:14 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Mon, 18 Jun 2018 09:55:14 +0000 (UTC) for IP:'137.65.250.81' DOMAIN:'smtp2.provo.novell.com' HELO:'smtp2.provo.novell.com' FROM:'mwilck@suse.com' RCPT:'' X-RedHat-Spam-Score: -2.301 (RCVD_IN_DNSWL_MED, SPF_PASS) 137.65.250.81 smtp2.provo.novell.com 137.65.250.81 smtp2.provo.novell.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.38 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: dm-devel@redhat.com Cc: dm-devel@redhat.com, Xose Vazquez Perez , Martin Wilck Subject: [dm-devel] [PATCH 30/30] fixup "libmultipath: merge hwentries inside a conf file" X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk 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-Scanned-By: MIMEDefang 2.84 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Mon, 18 Jun 2018 09:55:24 +0000 (UTC) X-Virus-Scanned: ClamAV using ClamSMTP The previous patch "libmultipath: merge hwentries inside a conf file" meant to enable checking for duplicate entries not only between different "sections" of the configuration (i.e. built-in hwtable, multipath.conf, config dir files), but also inside every section except the built-in table. This patch fixes a bug to actually implement this new behavior. Signed-off-by: Martin Wilck --- libmultipath/config.c | 3 --- tests/hwtable.c | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/libmultipath/config.c b/libmultipath/config.c index 28b76dd2..50826a1d 100644 --- a/libmultipath/config.c +++ b/libmultipath/config.c @@ -527,9 +527,6 @@ factorize_hwtable (vector hw, int n, const char *table_desc) restart: vector_foreach_slot(hw, hwe1, i) { - if (i == n) - break; - j = n; /* drop invalid device configs */ if (i >= n && (!hwe1->vendor || !hwe1->product)) { condlog(0, "device config in %s missing vendor or product parameter", diff --git a/tests/hwtable.c b/tests/hwtable.c index 3488640d..42127adf 100644 --- a/tests/hwtable.c +++ b/tests/hwtable.c @@ -661,8 +661,7 @@ static void test_broken_hwe(const struct hwt_state *hwt) /* foo:bar doesn't match, as hwentry is ignored */ pp = mock_path(vnd_foo.value, prd_bar.value); - TEST_PROP_BROKEN("prio", prio_name(&pp->prio), prio_emc.value, - DEFAULT_PRIO); + TEST_PROP(prio_name(&pp->prio), DEFAULT_PRIO); /* boo:bar doesn't match */ pp = mock_path(vnd_boo.value, prd_bar.value);