From patchwork Thu Aug 11 18:32:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xose Vazquez Perez X-Patchwork-Id: 9275773 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 B45BA6022E for ; Thu, 11 Aug 2016 18:36:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A76C028775 for ; Thu, 11 Aug 2016 18:36:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9C62128776; Thu, 11 Aug 2016 18:36:51 +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=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from mx6-phx2.redhat.com (mx6-phx2.redhat.com [209.132.183.39]) (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 4860C28778 for ; Thu, 11 Aug 2016 18:36:50 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx6-phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u7BIXKpI008649; Thu, 11 Aug 2016 14:33:21 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id u7BIXJ9R020386 for ; Thu, 11 Aug 2016 14:33:19 -0400 Received: from mx1.redhat.com (ext-mx05.extmail.prod.ext.phx2.redhat.com [10.5.110.29]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u7BIXJfq007312 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Thu, 11 Aug 2016 14:33:19 -0400 Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F40933293 for ; Thu, 11 Aug 2016 18:33:17 +0000 (UTC) Received: by mail-wm0-f66.google.com with SMTP id o80so811745wme.0 for ; Thu, 11 Aug 2016 11:33:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=L0xafBXvOv+Jk599FS35/mOpc5wFuF6ge/hWi3L3waU=; b=OH6WC7ycF4VzLcfFtQDYE+qPC+OsdEalJtCCt5JEQJ8Vqz2K6W94mkvb6xby2YUKru aAvVB9U87pFRcOiXbcPtSG6Euok9QFSNfMl18J7+iVx+Yv5iCD8XoQMzyvcmsYBom72L 0vwsDgwbb1MhYAveOYymNz2ARYPWd9AbXqa/VYYHcTgQunWN6u0zIbVrxMRBOXcn3+wn A47Nwq1eKN/JV/RSrKdDuB+9t49E7szAkhqcjVr8gNa007fTNBLJ0VuLDubksdtygmX4 GYhAA1avumjFrQwd+1VDDHwBy4QnoX0tD9z0qSXl9HT89nZAYfKhnZjMFPm4TZmPJ28A dyCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=L0xafBXvOv+Jk599FS35/mOpc5wFuF6ge/hWi3L3waU=; b=BHd0Sjem7qIR9pBj1IZcGR1lZVoDUBAkF06h6Ng/MY04e38k+urIDxzHtbcp+T6Qov s1+/WfI2MnXK3/2L6muxKsiwdxAP7tmGGxI7O1LFeg8heviVSLNTA3iJnjIuTY3OWxAJ YMz3RMWenwWPoyE9KM7vqSvHZdTTG9uiIqKFKHuXaSx+93/Y2Pt55eCoWR9APikX7hJw oGrZ0W0b2Wajo4+0BvJOGuPMP1Xl8QheuxOa5n65+7jBNsnopVbb2PFmjkuN7glGLFX7 FoD7JyH0px8x7Do5VClqGLluRBWpTMsIdU5UdsVEnWfBSgse+TGZvi7HeiQqv5tpjh1e 6v7w== X-Gm-Message-State: AEkoousMtYeIdgJaKgqU0vsrlmjWZwxAxxgUAAd7vjLMwGJHHESM3Bg0vpZruYaxFM1LcA== X-Received: by 10.28.48.202 with SMTP id w193mr11207188wmw.54.1470940396695; Thu, 11 Aug 2016 11:33:16 -0700 (PDT) Received: from localhost ([31.221.137.200]) by smtp.gmail.com with ESMTPSA id g7sm3904052wjx.10.2016.08.11.11.33.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Aug 2016 11:33:16 -0700 (PDT) From: Xose Vazquez Perez To: Date: Thu, 11 Aug 2016 20:32:23 +0200 Message-Id: <1470940345-4441-7-git-send-email-xose.vazquez@gmail.com> In-Reply-To: <1470940345-4441-1-git-send-email-xose.vazquez@gmail.com> References: <1470940345-4441-1-git-send-email-xose.vazquez@gmail.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Thu, 11 Aug 2016 18:33:18 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Thu, 11 Aug 2016 18:33:18 +0000 (UTC) for IP:'74.125.82.66' DOMAIN:'mail-wm0-f66.google.com' HELO:'mail-wm0-f66.google.com' FROM:'xose.vazquez@gmail.com' RCPT:'' X-RedHat-Spam-Score: -0.02 (BAYES_50, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_PASS) 74.125.82.66 mail-wm0-f66.google.com 74.125.82.66 mail-wm0-f66.google.com X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-Scanned-By: MIMEDefang 2.78 on 10.5.110.29 X-loop: dm-devel@redhat.com Cc: device-mapper development , Xose Vazquez Perez Subject: [dm-devel] [PATCH 07/11] multipath-tools: move DEFAULT_PRIO DEFAULT_PRIO_ARGS and DEFAULT_CHECKER to libmultipath/defaults.h 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 Cc: Christophe Varoqui Cc: device-mapper development Signed-off-by: Xose Vazquez Perez --- libmultipath/checkers.h | 3 +-- libmultipath/defaults.h | 3 +++ libmultipath/prio.h | 4 +--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libmultipath/checkers.h b/libmultipath/checkers.h index 502d2d9..4fb97c9 100644 --- a/libmultipath/checkers.h +++ b/libmultipath/checkers.h @@ -3,6 +3,7 @@ #include "list.h" #include "memory.h" +#include "defaults.h" /* * @@ -86,8 +87,6 @@ enum path_check_state { #define CCISS_TUR "cciss_tur" #define RBD "rbd" -#define DEFAULT_CHECKER TUR - #define ASYNC_TIMEOUT_SEC 30 /* diff --git a/libmultipath/defaults.h b/libmultipath/defaults.h index 3af85eb..9bf27d6 100644 --- a/libmultipath/defaults.h +++ b/libmultipath/defaults.h @@ -28,6 +28,9 @@ #define DEFAULT_RETRIGGER_DELAY 10 #define DEFAULT_RETRIGGER_TRIES 3 #define DEFAULT_UEV_WAIT_TIMEOUT 30 +#define DEFAULT_PRIO "const" +#define DEFAULT_PRIO_ARGS "" +#define DEFAULT_CHECKER TUR #define DEFAULT_CHECKINT 5 #define MAX_CHECKINT(a) (a << 2) diff --git a/libmultipath/prio.h b/libmultipath/prio.h index 032028e..261105b 100644 --- a/libmultipath/prio.h +++ b/libmultipath/prio.h @@ -12,9 +12,7 @@ struct path; #include "list.h" #include "memory.h" - -#define DEFAULT_PRIO "const" -#define DEFAULT_PRIO_ARGS "" +#include "defaults.h" /* * Known prioritizers for use in hwtable.c