From patchwork Tue Feb 28 16:23:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Wilck X-Patchwork-Id: 9596235 X-Patchwork-Delegate: snitzer@redhat.com 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 E373760574 for ; Tue, 28 Feb 2017 16:25:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D5CCE26CF9 for ; Tue, 28 Feb 2017 16:25:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CAEF6284F5; Tue, 28 Feb 2017 16:25:59 +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 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.wl.linuxfoundation.org (Postfix) with ESMTPS id 5C1AA284A5 for ; Tue, 28 Feb 2017 16:25:59 +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 v1SGOVDG014460; Tue, 28 Feb 2017 11:24:31 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v1SGNvmP005890 for ; Tue, 28 Feb 2017 11:23:57 -0500 Received: from mx1.redhat.com (ext-mx05.extmail.prod.ext.phx2.redhat.com [10.5.110.29]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v1SGNv8k001790 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Tue, 28 Feb 2017 11:23:57 -0500 Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9F5352E6076 for ; Tue, 28 Feb 2017 16:23:56 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id A90EFADD0 for ; Tue, 28 Feb 2017 16:23:53 +0000 (UTC) From: Martin Wilck To: dm-devel@redhat.com Date: Tue, 28 Feb 2017 17:23:23 +0100 Message-Id: <20170228162329.14517-28-mwilck@suse.com> In-Reply-To: <20170228162329.14517-1-mwilck@suse.com> References: <20170228162329.14517-1-mwilck@suse.com> X-Greylist: Sender passed SPF test, Sender IP whitelisted by DNSRBL, ACL 202 matched, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Tue, 28 Feb 2017 16:23:56 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Tue, 28 Feb 2017 16:23:56 +0000 (UTC) for IP:'195.135.220.15' DOMAIN:'mx2.suse.de' HELO:'mx2.suse.de' FROM:'mwilck@suse.com' RCPT:'' X-RedHat-Spam-Score: -1.501 (BAYES_50, RCVD_IN_DNSWL_MED, SPF_PASS) 195.135.220.15 mx2.suse.de 195.135.220.15 mx2.suse.de X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Scanned-By: MIMEDefang 2.78 on 10.5.110.29 X-loop: dm-devel@redhat.com Cc: Martin Wilck Subject: [dm-devel] [PATCH 27/33] libmultipath: differentiate ACT_NOTHING and ACT_IMPOSSIBLE 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-Virus-Scanned: ClamAV using ClamSMTP From: Martin Wilck select_action uses ACT_NOTHING for two different cases, 1) if changes can't be applied for some reason, and 2) if nothing needs to be done. Introduce ACT_IMPOSSIBLE for case 1). Signed-off-by: Martin Wilck --- libmultipath/configure.c | 7 ++++--- libmultipath/configure.h | 1 + libmultipath/print.c | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/libmultipath/configure.c b/libmultipath/configure.c index b400bb96..025947a8 100644 --- a/libmultipath/configure.c +++ b/libmultipath/configure.c @@ -464,13 +464,13 @@ select_action (struct multipath * mpp, vector curmp, int force_reload) /* reset alias to existing alias */ FREE(mpp->alias); mpp->alias = STRDUP(cmpp->alias); - mpp->action = ACT_NOTHING; + mpp->action = ACT_IMPOSSIBLE; return; } if (pathcount(mpp, PATH_UP) == 0) { - mpp->action = ACT_NOTHING; - condlog(3, "%s: set ACT_NOTHING (no usable path)", + mpp->action = ACT_IMPOSSIBLE; + condlog(3, "%s: set ACT_IMPOSSIBLE (no usable path)", mpp->alias); return; } @@ -671,6 +671,7 @@ int domap(struct multipath *mpp, char *params, int is_daemon) switch (mpp->action) { case ACT_REJECT: case ACT_NOTHING: + case ACT_IMPOSSIBLE: return DOMAP_EXIST; case ACT_SWITCHPG: diff --git a/libmultipath/configure.h b/libmultipath/configure.h index 442c956d..fb078a61 100644 --- a/libmultipath/configure.h +++ b/libmultipath/configure.h @@ -20,6 +20,7 @@ enum actions { ACT_RESIZE, ACT_FORCERENAME, ACT_DRY_RUN, + ACT_IMPOSSIBLE, }; #define FLUSH_ONE 1 diff --git a/libmultipath/print.c b/libmultipath/print.c index 00a36267..7c2a1588 100644 --- a/libmultipath/print.c +++ b/libmultipath/print.c @@ -996,7 +996,7 @@ int snprint_multipath_topology(char *buff, int len, struct multipath *mpp, if (verbosity > 1 && mpp->action != ACT_NOTHING && - mpp->action != ACT_UNDEF) + mpp->action != ACT_UNDEF && mpp->action != ACT_IMPOSSIBLE) c += sprintf(c, "%%A: "); c += sprintf(c, "%%n");