From patchwork Fri Jan 19 00:29:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Wilck X-Patchwork-Id: 10174361 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 BD497602B1 for ; Fri, 19 Jan 2018 00:31:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B026528469 for ; Fri, 19 Jan 2018 00:31:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A4EAD2855C; Fri, 19 Jan 2018 00:31:27 +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 4D29B28469 for ; Fri, 19 Jan 2018 00:31:27 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9684F5147D; Fri, 19 Jan 2018 00:31:26 +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 727F518A37; Fri, 19 Jan 2018 00:31:26 +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 373AB410B5; Fri, 19 Jan 2018 00:31:26 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w0J0TpYA013372 for ; Thu, 18 Jan 2018 19:29:51 -0500 Received: by smtp.corp.redhat.com (Postfix) id 8233B60C90; Fri, 19 Jan 2018 00:29:51 +0000 (UTC) Delivered-To: dm-devel@redhat.com Received: from mx1.redhat.com (ext-mx07.extmail.prod.ext.phx2.redhat.com [10.5.110.31]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7A92260C8A; Fri, 19 Jan 2018 00:29:51 +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 1514BC050049; Fri, 19 Jan 2018 00:29:50 +0000 (UTC) Received: from emea4-mta.ukb.novell.com ([10.120.13.87]) by smtp.nue.novell.com with ESMTP (TLS encrypted); Fri, 19 Jan 2018 01:29:48 +0100 Received: from apollon.suse.de.de (nwb-a10-snat.microfocus.com [10.120.13.201]) by emea4-mta.ukb.novell.com with ESMTP (TLS encrypted); Fri, 19 Jan 2018 00:29:38 +0000 From: Martin Wilck To: Christophe Varoqui , dm-devel@redhat.com, Benjamin Marzinski Date: Fri, 19 Jan 2018 01:29:11 +0100 Message-Id: <20180119002916.10323-12-mwilck@suse.com> In-Reply-To: <20180119002916.10323-1-mwilck@suse.com> References: <20180119002916.10323-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.31]); Fri, 19 Jan 2018 00:29:50 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Fri, 19 Jan 2018 00:29:50 +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.31 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: dm-devel@redhat.com Cc: Xose Vazquez Perez , Martin Wilck Subject: [dm-devel] [RFC PATCH 11/16] multipath: common code path for CMD_VALID_PATH 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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Fri, 19 Jan 2018 00:31:26 +0000 (UTC) X-Virus-Scanned: ClamAV using ClamSMTP Print the result message in one place only. This simplifies future changes. --- multipath/main.c | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/multipath/main.c b/multipath/main.c index b7e5cf46fe0f..4b3d3a94b282 100644 --- a/multipath/main.c +++ b/multipath/main.c @@ -336,6 +336,17 @@ out: return r; } +static void print_cmd_valid(const char *devpath, int k) +{ + const char *msg[] = { "is", "is not" }; + + if (k < 0 || k >= sizeof(msg)) + return; + + printf("%s %s a valid multipath device path\n", + devpath, msg[k]); +} + /* * Return value: * -1: Retry @@ -377,10 +388,7 @@ configure (struct config *conf, enum mpath_cmds cmd, cmd != CMD_REMOVE_WWID && (filter_devnode(conf->blist_devnode, conf->elist_devnode, dev) > 0)) { - if (cmd == CMD_VALID_PATH) - printf("%s is not a valid multipath device path\n", - devpath); - goto out; + goto print_valid; } /* @@ -393,7 +401,7 @@ configure (struct config *conf, enum mpath_cmds cmd, if (!refwwid) { condlog(4, "%s: failed to get wwid", devpath); if (failed == 2 && cmd == CMD_VALID_PATH) - printf("%s is not a valid multipath device path\n", devpath); + goto print_valid; else condlog(3, "scope is null"); goto out; @@ -432,9 +440,7 @@ configure (struct config *conf, enum mpath_cmds cmd, r = 0; if (r == 0 || !conf->find_multipaths || !conf->ignore_wwids) { - printf("%s %s a valid multipath device path\n", - devpath, r == 0 ? "is" : "is not"); - goto out; + goto print_valid; } } } @@ -477,9 +483,7 @@ configure (struct config *conf, enum mpath_cmds cmd, * the refwwid, then the path is valid */ if (VECTOR_SIZE(curmp) != 0 || VECTOR_SIZE(pathvec) > 1) r = 0; - printf("%s %s a valid multipath device path\n", - devpath, r == 0 ? "is" : "is not"); - goto out; + goto print_valid; } if (cmd != CMD_CREATE && cmd != CMD_DRY_RUN) { @@ -493,6 +497,10 @@ configure (struct config *conf, enum mpath_cmds cmd, r = coalesce_paths(&vecs, NULL, refwwid, conf->force_reload, cmd); +print_valid: + if (cmd == CMD_VALID_PATH) + print_cmd_valid(devpath, r); + out: if (refwwid) FREE(refwwid);