From patchwork Mon Jul 4 07:08:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hannes Reinecke X-Patchwork-Id: 9211743 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 2794560572 for ; Mon, 4 Jul 2016 07:13:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1332E27C2C for ; Mon, 4 Jul 2016 07:13:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 083AD28411; Mon, 4 Jul 2016 07:13: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 mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 90A0C27C2C for ; Mon, 4 Jul 2016 07:13:11 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id u6479cfb005526; Mon, 4 Jul 2016 03:09:38 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id u6479CY7017754 for ; Mon, 4 Jul 2016 03:09:12 -0400 Received: from mx1.redhat.com (ext-mx04.extmail.prod.ext.phx2.redhat.com [10.5.110.28]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u6479CQL012151 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Mon, 4 Jul 2016 03:09:12 -0400 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 61BA585545; Mon, 4 Jul 2016 07:09:11 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 9E3AAAD68; Mon, 4 Jul 2016 07:09:05 +0000 (UTC) From: Hannes Reinecke To: Christophe Varoqui Date: Mon, 4 Jul 2016 09:08:38 +0200 Message-Id: <1467616126-10036-19-git-send-email-hare@suse.de> In-Reply-To: <1467616126-10036-1-git-send-email-hare@suse.de> References: <1467616126-10036-1-git-send-email-hare@suse.de> X-Greylist: Sender IP whitelisted by DNSRBL, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Mon, 04 Jul 2016 07:09:11 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Mon, 04 Jul 2016 07:09:11 +0000 (UTC) for IP:'195.135.220.15' DOMAIN:'mx2.suse.de' HELO:'mx2.suse.de' FROM:'hare@suse.de' RCPT:'' X-RedHat-Spam-Score: -3.188 (BAYES_50, DCC_REPUT_00_12, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, 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.24 X-Scanned-By: MIMEDefang 2.75 on 10.5.110.28 X-loop: dm-devel@redhat.com Cc: Hannes Reinecke , dm-devel@redhat.com Subject: [dm-devel] [PATCH 18/26] checkers: use 'multipath_dir' as argument 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 Pass in the 'multipath_dir' config setting as explicit argument for init_checkers() and checker_get(). With this we can remove references to struct config. Signed-off-by: Hannes Reinecke --- libmultipath/checkers.c | 22 +++++++++++++--------- libmultipath/checkers.h | 6 +++--- libmultipath/propsel.c | 2 +- multipath/main.c | 2 +- multipathd/main.c | 2 +- 5 files changed, 19 insertions(+), 15 deletions(-) diff --git a/libmultipath/checkers.c b/libmultipath/checkers.c index ef1d099..ad7d96c 100644 --- a/libmultipath/checkers.c +++ b/libmultipath/checkers.c @@ -7,7 +7,6 @@ #include "debug.h" #include "checkers.h" #include "vector.h" -#include "config.h" char *checker_state_names[] = { "wild", @@ -29,9 +28,9 @@ char * checker_state_name (int i) return checker_state_names[i]; } -int init_checkers (void) +int init_checkers (char *multipath_dir) { - if (!add_checker(DEFAULT_CHECKER)) + if (!add_checker(multipath_dir, DEFAULT_CHECKER)) return 1; return 0; } @@ -89,10 +88,10 @@ struct checker * checker_lookup (char * name) if (!strncmp(name, c->name, CHECKER_NAME_LEN)) return c; } - return add_checker(name); + return NULL; } -struct checker * add_checker (char * name) +struct checker * add_checker (char *multipath_dir, char * name) { char libname[LIB_CHECKER_NAMELEN]; struct stat stbuf; @@ -104,10 +103,10 @@ struct checker * add_checker (char * name) return NULL; snprintf(c->name, CHECKER_NAME_LEN, "%s", name); snprintf(libname, LIB_CHECKER_NAMELEN, "%s/libcheck%s.so", - conf->multipath_dir, name); + multipath_dir, name); if (stat(libname,&stbuf) < 0) { condlog(0,"Checker '%s' not found in %s", - name, conf->multipath_dir); + name, multipath_dir); goto out; } condlog(3, "loading %s checker", libname); @@ -253,13 +252,18 @@ void checker_clear_message (struct checker *c) c->message[0] = '\0'; } -void checker_get (struct checker * dst, char * name) +void checker_get (char *multipath_dir, struct checker * dst, char * name) { - struct checker * src = checker_lookup(name); + struct checker * src = NULL; if (!dst) return; + if (name && strlen(name)) { + src = checker_lookup(name); + if (!src) + src = add_checker(multipath_dir, name); + } if (!src) { dst->check = NULL; return; diff --git a/libmultipath/checkers.h b/libmultipath/checkers.h index a935b3f..a24b12e 100644 --- a/libmultipath/checkers.h +++ b/libmultipath/checkers.h @@ -119,9 +119,9 @@ struct checker { #define MSG(c, fmt, args...) snprintf((c)->message, CHECKER_MSG_LEN, fmt, ##args); char * checker_state_name (int); -int init_checkers (void); +int init_checkers (char *); void cleanup_checkers (void); -struct checker * add_checker (char *); +struct checker * add_checker (char *, char *); struct checker * checker_lookup (char *); int checker_init (struct checker *, void **); void checker_put (struct checker *); @@ -136,6 +136,6 @@ int checker_selected (struct checker *); char * checker_name (struct checker *); char * checker_message (struct checker *); void checker_clear_message (struct checker *c); -void checker_get (struct checker *, char *); +void checker_get (char *, struct checker *, char *); #endif /* _CHECKERS_H */ diff --git a/libmultipath/propsel.c b/libmultipath/propsel.c index 71a0941..c1d9192 100644 --- a/libmultipath/propsel.c +++ b/libmultipath/propsel.c @@ -328,7 +328,7 @@ select_checker(struct path *pp) do_set(checker_name, conf, checker_name, "(config file setting)"); do_default(checker_name, DEFAULT_CHECKER); out: - checker_get(c, checker_name); + checker_get(conf->multipath_dir, c, checker_name); condlog(3, "%s: path_checker = %s %s", pp->dev, c->name, origin); if (conf->checker_timeout) { c->timeout = conf->checker_timeout; diff --git a/multipath/main.c b/multipath/main.c index ca4c1f5..70412a8 100644 --- a/multipath/main.c +++ b/multipath/main.c @@ -622,7 +622,7 @@ main (int argc, char *argv[]) conf->max_fds, strerror(errno)); } - if (init_checkers()) { + if (init_checkers(conf->multipath_dir)) { condlog(0, "failed to initialize checkers"); goto out; } diff --git a/multipathd/main.c b/multipathd/main.c index 61ef2e6..5a12007 100644 --- a/multipathd/main.c +++ b/multipathd/main.c @@ -2110,7 +2110,7 @@ child (void * param) dm_init(conf->verbosity); dm_drv_version(conf->version, TGT_MPATH); - if (init_checkers()) { + if (init_checkers(conf->multipath_dir)) { condlog(0, "failed to initialize checkers"); goto failed; }