From patchwork Fri Jun 8 10:20:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Wilck X-Patchwork-Id: 10454079 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 80D226037F for ; Fri, 8 Jun 2018 10:21:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7CB8029514 for ; Fri, 8 Jun 2018 10:21:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 71A1D2951C; Fri, 8 Jun 2018 10:21:31 +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 14B0229514 for ; Fri, 8 Jun 2018 10:21:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A7EE8307D88B; Fri, 8 Jun 2018 10:21:29 +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 5F9F06252E; Fri, 8 Jun 2018 10:21:29 +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 1A5A24CA81; Fri, 8 Jun 2018 10:21:29 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w58ALS0O017868 for ; Fri, 8 Jun 2018 06:21:28 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1E42EA112F; Fri, 8 Jun 2018 10:21:28 +0000 (UTC) Delivered-To: dm-devel@redhat.com Received: from mx1.redhat.com (ext-mx14.extmail.prod.ext.phx2.redhat.com [10.5.110.43]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 13418A112C; Fri, 8 Jun 2018 10:21:28 +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 EBF9E308FB8B; Fri, 8 Jun 2018 10:21:26 +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); Fri, 08 Jun 2018 04:21:19 -0600 From: Martin Wilck To: Christophe Varoqui Date: Fri, 8 Jun 2018 12:20:24 +0200 Message-Id: <20180608102041.22904-12-mwilck@suse.com> In-Reply-To: <20180608102041.22904-1-mwilck@suse.com> References: <20180608102041.22904-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.43]); Fri, 08 Jun 2018 10:21:27 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Fri, 08 Jun 2018 10:21:27 +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.84 on 10.5.110.43 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.27 X-loop: dm-devel@redhat.com Cc: dm-devel@redhat.com, Xose Vazquez Perez , Martin Wilck Subject: [dm-devel] [PATCH 11/28] libmultipath: add debug messages to hwentry lookup/merging code 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.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Fri, 08 Jun 2018 10:21:30 +0000 (UTC) X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Martin Wilck --- libmultipath/config.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/libmultipath/config.c b/libmultipath/config.c index d2812e4a..9e2f166f 100644 --- a/libmultipath/config.c +++ b/libmultipath/config.c @@ -103,6 +103,16 @@ out: return retval; } +static void _log_match(const char *fn, const struct hwentry *h, + const char *vendor, const char *product, + const char *revision) +{ + condlog(4, "%s: found match /%s:%s:%s/ for '%s:%s:%s'", fn, + h->vendor, h->product, h->revision, + vendor, product, revision); +} +#define log_match(h, v, p, r) _log_match(__func__, (h), (v), (p), (r)) + struct hwentry * find_hwe (const struct _vector *hwtable, const char * vendor, const char * product, const char * revision) @@ -120,6 +130,7 @@ find_hwe (const struct _vector *hwtable, if (hwe_regmatch(tmp, vendor, product, revision)) continue; ret = tmp; + log_match(tmp, vendor, product, revision); break; } return ret; @@ -457,8 +468,13 @@ restart: hwe2->product, hwe2->revision)) continue; /* dup */ + log_match(hwe1, hwe2->vendor, + hwe2->product, hwe2->revision); merge_hwe(hwe2, hwe1); if (hwe_strmatch(hwe2, hwe1) == 0) { + condlog(4, "%s: removing hwentry %s:%s:%s", + __func__, hwe1->vendor, hwe1->product, + hwe1->revision); vector_del_slot(hw, i); free_hwe(hwe1); n -= 1;