From patchwork Mon Jul 15 13:00:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hannes Reinecke X-Patchwork-Id: 2827489 Return-Path: X-Original-To: patchwork-dm-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 3A94E9F7D6 for ; Mon, 15 Jul 2013 13:08:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1DFD42015C for ; Mon, 15 Jul 2013 13:08:11 +0000 (UTC) Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) by mail.kernel.org (Postfix) with ESMTP id 5E4842015F for ; Mon, 15 Jul 2013 13:08:06 +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 r6FD25pq015539; Mon, 15 Jul 2013 09:02:05 -0400 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 r6FD0eQY029027 for ; Mon, 15 Jul 2013 09:00:40 -0400 Received: from mx1.redhat.com (ext-mx14.extmail.prod.ext.phx2.redhat.com [10.5.110.19]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r6FD0ebc002447 for ; Mon, 15 Jul 2013 09:00:40 -0400 Received: from mx2.suse.de (cantor2.suse.de [195.135.220.15]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r6FD0cRZ031301 for ; Mon, 15 Jul 2013 09:00:39 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 964CAA5429; Mon, 15 Jul 2013 15:00:35 +0200 (CEST) From: Hannes Reinecke To: Christophe Varoqui Date: Mon, 15 Jul 2013 15:00:20 +0200 Message-Id: <1373893230-26077-20-git-send-email-hare@suse.de> In-Reply-To: <1373893230-26077-1-git-send-email-hare@suse.de> References: <1373893230-26077-1-git-send-email-hare@suse.de> X-RedHat-Spam-Score: -7.69 (BAYES_00, DCC_REPUT_00_12, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, URIBL_BLOCKED) X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Scanned-By: MIMEDefang 2.68 on 10.5.110.19 X-loop: dm-devel@redhat.com Cc: dm-devel@redhat.com Subject: [dm-devel] [PATCH 19/29] Correctly set pgfailback X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk Reply-To: device-mapper development 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-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Something weird happened to pgfailback; no default was assigned when loading the configuration, but then it got set (wrongly) to the default value when printing the configuration. Signed-off-by: Hannes Reinecke --- libmultipath/config.c | 1 + libmultipath/dict.c | 16 +++++----------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/libmultipath/config.c b/libmultipath/config.c index cc44244..8013a07 100644 --- a/libmultipath/config.c +++ b/libmultipath/config.c @@ -556,6 +556,7 @@ load_config (char * file, struct udev *udev) conf->reassign_maps = DEFAULT_REASSIGN_MAPS; conf->checkint = DEFAULT_CHECKINT; conf->max_checkint = MAX_CHECKINT(conf->checkint); + conf->pgfailback = DEFAULT_FAILBACK; conf->fast_io_fail = DEFAULT_FAST_IO_FAIL; conf->retain_hwhandler = DEFAULT_RETAIN_HWHANDLER; conf->detect_prio = DEFAULT_DETECT_PRIO; diff --git a/libmultipath/dict.c b/libmultipath/dict.c index 4b840de..0408e03 100644 --- a/libmultipath/dict.c +++ b/libmultipath/dict.c @@ -1869,12 +1869,11 @@ snprint_mp_failback (char * buff, int len, void * data) { struct mpentry * mpe = (struct mpentry *)data; - if (!mpe->pgfailback) + if (mpe->pgfailback == FAILBACK_UNDEF || + mpe->pgfailback == DEFAULT_FAILBACK) return 0; switch(mpe->pgfailback) { - case FAILBACK_UNDEF: - break; case -FAILBACK_MANUAL: return snprintf(buff, len, "\"manual\""); case -FAILBACK_IMMEDIATE: @@ -2247,12 +2246,11 @@ snprint_hw_failback (char * buff, int len, void * data) { struct hwentry * hwe = (struct hwentry *)data; - if (!hwe->pgfailback) + if (hwe->pgfailback == FAILBACK_UNDEF || + hwe->pgfailback == DEFAULT_FAILBACK) return 0; switch(hwe->pgfailback) { - case FAILBACK_UNDEF: - break; case -FAILBACK_MANUAL: return snprintf(buff, len, "\"manual\""); case -FAILBACK_IMMEDIATE: @@ -2534,13 +2532,9 @@ snprint_def_path_checker (char * buff, int len, void * data) static int snprint_def_failback (char * buff, int len, void * data) { - int pgfailback = conf->pgfailback; - if (!pgfailback) - pgfailback = DEFAULT_FAILBACK; - switch(conf->pgfailback) { case FAILBACK_UNDEF: - break; + return snprintf(buff, len, "\"undef\""); case -FAILBACK_MANUAL: return snprintf(buff, len, "\"manual\""); case -FAILBACK_IMMEDIATE: