From patchwork Mon Jan 29 23:57:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Wilck X-Patchwork-Id: 10191111 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 C96C6602B5 for ; Mon, 29 Jan 2018 23:59:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B93FF284DA for ; Mon, 29 Jan 2018 23:59:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ACA4D28583; Mon, 29 Jan 2018 23:59:12 +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=-6.9 required=2.0 tests=BAYES_00,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 46255284DA for ; Mon, 29 Jan 2018 23:59:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F397B5D67A; Mon, 29 Jan 2018 23:59:10 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9A62317DD4; Mon, 29 Jan 2018 23:59:10 +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 CE8E918033D9; Mon, 29 Jan 2018 23:59:09 +0000 (UTC) Received: from smtp.corp.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 w0TNx8xe003182 for ; Mon, 29 Jan 2018 18:59:08 -0500 Received: by smtp.corp.redhat.com (Postfix) id 2F73518A84; Mon, 29 Jan 2018 23:59:08 +0000 (UTC) Delivered-To: dm-devel@redhat.com Received: from mx1.redhat.com (ext-mx03.extmail.prod.ext.phx2.redhat.com [10.5.110.27]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 50B39425F; Mon, 29 Jan 2018 23:59:06 +0000 (UTC) Received: from smtp.nue.novell.com (smtp.nue.novell.com [195.135.221.5]) (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 0B6CE80F95; Mon, 29 Jan 2018 23:59:03 +0000 (UTC) Received: from emea4-mta.ukb.novell.com ([10.120.13.87]) by smtp.nue.novell.com with ESMTP (TLS encrypted); Tue, 30 Jan 2018 00:59:00 +0100 Received: from apollon.suse.de.de (nwb-a10-snat.microfocus.com [10.120.13.202]) by emea4-mta.ukb.novell.com with ESMTP (TLS encrypted); Mon, 29 Jan 2018 23:58:48 +0000 From: Martin Wilck To: Christophe Varoqui , ritika.srivastava@oracle.com, dm-devel@redhat.com Date: Tue, 30 Jan 2018 00:57:50 +0100 Message-Id: <20180129235750.28425-1-mwilck@suse.com> In-Reply-To: <0f6c9e29-b4a7-74b9-4ce0-b776214d9466@oracle.com> References: <0f6c9e29-b4a7-74b9-4ce0-b776214d9466@oracle.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.27]); Mon, 29 Jan 2018 23:59:04 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Mon, 29 Jan 2018 23:59:04 +0000 (UTC) for IP:'195.135.221.5' DOMAIN:'smtp.nue.novell.com' HELO:'smtp.nue.novell.com' FROM:'mwilck@suse.com' RCPT:'' X-RedHat-Spam-Score: -2.301 (RCVD_IN_DNSWL_MED, SPF_PASS) 195.135.221.5 smtp.nue.novell.com 195.135.221.5 smtp.nue.novell.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.27 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: dm-devel@redhat.com Cc: Xose Vazquez Perez , Martin Wilck Subject: [dm-devel] [PATCH v2] multipathd: ignore uevents for non-mpath devices 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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Mon, 29 Jan 2018 23:59:11 +0000 (UTC) X-Virus-Scanned: ClamAV using ClamSMTP multipathd can't deal with other devices anyway. Proceeding further with events for other devices just generates log noise. Based on an idea from Ritika Srivastava . ("multipath-tools: Skip CHANGE uevent for non-mpath devices"). Changes in v2: always return immediately for non-mpath case (Ritika Srivastava) Signed-off-by: Martin Wilck Reviewed-by: Ritika Srivastava --- multipathd/main.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/multipathd/main.c b/multipathd/main.c index ff3ecb640487..a8a0c302e8fe 100644 --- a/multipathd/main.c +++ b/multipathd/main.c @@ -1122,6 +1122,8 @@ uev_trigger (struct uevent * uev, void * trigger_data) * are not fully initialised then. */ if (!strncmp(uev->kernel, "dm-", 3)) { + if (!uevent_is_mpath(uev)) + goto out; if (!strncmp(uev->action, "change", 6)) { r = uev_add_map(uev, vecs); @@ -1132,11 +1134,8 @@ uev_trigger (struct uevent * uev, void * trigger_data) * cess. */ uev_pathfail_check(uev, vecs); - goto out; - } - if (!strncmp(uev->action, "remove", 6)) { + } else if (!strncmp(uev->action, "remove", 6)) { r = uev_remove_map(uev, vecs); - goto out; } goto out; }