From patchwork Mon Jul 4 07:08:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hannes Reinecke X-Patchwork-Id: 9211745 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 9A85560572 for ; Mon, 4 Jul 2016 07:13:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 85ACF27C2C for ; Mon, 4 Jul 2016 07:13:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7A8F628411; Mon, 4 Jul 2016 07:13:13 +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 E3B0127C2C for ; Mon, 4 Jul 2016 07:13:12 +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 u6479bQb005509; Mon, 4 Jul 2016 03:09:37 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id u6479AYE017673 for ; Mon, 4 Jul 2016 03:09:10 -0400 Received: from mx1.redhat.com (ext-mx01.extmail.prod.ext.phx2.redhat.com [10.5.110.25]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u6479ART002708 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Mon, 4 Jul 2016 03:09:10 -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 0ACB6C3018; Mon, 4 Jul 2016 07:09:09 +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 5B293ACAE; Mon, 4 Jul 2016 07:09:05 +0000 (UTC) From: Hannes Reinecke To: Christophe Varoqui Date: Mon, 4 Jul 2016 09:08:27 +0200 Message-Id: <1467616126-10036-8-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.25]); Mon, 04 Jul 2016 07:09:09 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 04 Jul 2016 07:09:09 +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.27 X-Scanned-By: MIMEDefang 2.75 on 10.5.110.25 X-loop: dm-devel@redhat.com Cc: Hannes Reinecke , dm-devel@redhat.com Subject: [dm-devel] [PATCH 07/26] libmultipath: drop 'daemon' configuration setting 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 There is no need anymore to access the 'daemon' configuration setting as all callers export the 'is_daemon' argument, so it can be removed from the config structure. Signed-off-by: Hannes Reinecke --- libmpathpersist/mpath_persist.c | 2 +- libmultipath/config.h | 1 - multipath/main.c | 5 ++--- multipathd/cli_handlers.c | 6 +++--- multipathd/main.c | 18 ++++++++---------- 5 files changed, 14 insertions(+), 18 deletions(-) diff --git a/libmpathpersist/mpath_persist.c b/libmpathpersist/mpath_persist.c index ad6aec9..af2374f 100644 --- a/libmpathpersist/mpath_persist.c +++ b/libmpathpersist/mpath_persist.c @@ -395,7 +395,7 @@ get_mpvec (vector curmp, vector pathvec, char * refwwid) condlog(3, "params = %s", params); dm_get_status(mpp->alias, status); condlog(3, "status = %s", status); - disassemble_map (pathvec, params, mpp, conf->daemon); + disassemble_map (pathvec, params, mpp, 0); /* * disassemble_map() can add new paths to pathvec. diff --git a/libmultipath/config.h b/libmultipath/config.h index 7693ca6..bd31037 100644 --- a/libmultipath/config.h +++ b/libmultipath/config.h @@ -115,7 +115,6 @@ struct config { int queue_without_daemon; int ignore_wwids; int checker_timeout; - int daemon; int flush_on_last_del; int attribute_flags; int fast_io_fail; diff --git a/multipath/main.c b/multipath/main.c index 4b77023..7c35ce1 100644 --- a/multipath/main.c +++ b/multipath/main.c @@ -206,7 +206,7 @@ get_dm_mpvec (vector curmp, vector pathvec, char * refwwid) dm_get_status(mpp->alias, status); condlog(3, "status = %s", status); - disassemble_map(pathvec, params, mpp, conf->daemon); + disassemble_map(pathvec, params, mpp, 0); /* * disassemble_map() can add new paths to pathvec. @@ -381,7 +381,7 @@ configure (void) * core logic entry point */ r = coalesce_paths(&vecs, NULL, refwwid, - conf->force_reload, conf->daemon); + conf->force_reload, 0); out: if (refwwid) @@ -604,7 +604,6 @@ main (int argc, char *argv[]) goto out; } } - conf->daemon = 0; if (conf->dev_type == DEV_UEVENT) { openlog("multipath", 0, LOG_DAEMON); setlogmask(LOG_UPTO(conf->verbosity + 3)); diff --git a/multipathd/cli_handlers.c b/multipathd/cli_handlers.c index 0ca0807..eaeaa74 100644 --- a/multipathd/cli_handlers.c +++ b/multipathd/cli_handlers.c @@ -711,7 +711,7 @@ cli_add_map (void * v, char ** reply, int * len, void * data) rc = get_refwwid(param, DEV_DEVMAP, vecs->pathvec, &refwwid); if (refwwid) { - if (coalesce_paths(vecs, NULL, refwwid, 0, conf->daemon)) + if (coalesce_paths(vecs, NULL, refwwid, 0, 1)) condlog(2, "%s: coalesce_paths failed", param); dm_lib_release(); @@ -789,7 +789,7 @@ cli_reload(void *v, char **reply, int *len, void *data) return 1; } - return reload_map(vecs, mpp, 0, conf->daemon); + return reload_map(vecs, mpp, 0, 1); } int resize_map(struct multipath *mpp, unsigned long long size, @@ -802,7 +802,7 @@ int resize_map(struct multipath *mpp, unsigned long long size, update_mpp_paths(mpp, vecs->pathvec); setup_map(mpp, params, PARAMS_SIZE); mpp->action = ACT_RESIZE; - if (domap(mpp, params, conf->daemon) <= 0) { + if (domap(mpp, params, 1) <= 0) { condlog(0, "%s: failed to resize map : %s", mpp->alias, strerror(errno)); mpp->size = orig_size; diff --git a/multipathd/main.c b/multipathd/main.c index 22284f9..9568ae9 100644 --- a/multipathd/main.c +++ b/multipathd/main.c @@ -379,7 +379,7 @@ retry: retries = -1; goto fail; } - if (domap(mpp, params, conf->daemon) <= 0 && retries-- > 0) { + if (domap(mpp, params, 1) <= 0 && retries-- > 0) { condlog(0, "%s: map_udate sleep", mpp->alias); sleep(1); goto retry; @@ -487,7 +487,7 @@ ev_add_map (char * dev, char * alias, struct vectors * vecs) r = get_refwwid(dev, DEV_DEVMAP, vecs->pathvec, &refwwid); if (refwwid) { - r = coalesce_paths(vecs, NULL, refwwid, 0, conf->daemon); + r = coalesce_paths(vecs, NULL, refwwid, 0, 1); dm_lib_release(); } @@ -724,7 +724,7 @@ rescan: * reload the map for the multipath mapped device */ retry: - ret = domap(mpp, params, conf->daemon); + ret = domap(mpp, params, 1); if (ret <= 0) { if (ret < 0 && retries-- > 0) { condlog(0, "%s: retry domap for addition of new " @@ -866,7 +866,7 @@ ev_remove_path (struct path *pp, struct vectors * vecs) * reload the map */ mpp->action = ACT_RELOAD; - if (domap(mpp, params, conf->daemon) <= 0) { + if (domap(mpp, params, 1) <= 0) { condlog(0, "%s: failed in domap for " "removal of path %s", mpp->alias, pp->dev); @@ -931,7 +931,7 @@ uev_update_path (struct uevent *uev, struct vectors * vecs) } } if (mpp) { - retval = reload_map(vecs, mpp, 0, conf->daemon); + retval = reload_map(vecs, mpp, 0, 1); condlog(2, "%s: map %s reloaded (retval %d)", uev->kernel, mpp->alias, retval); @@ -1361,7 +1361,7 @@ int update_prio(struct path *pp, int refresh_all) int update_path_groups(struct multipath *mpp, struct vectors *vecs, int refresh) { - if (reload_map(vecs, mpp, refresh, conf->daemon)) + if (reload_map(vecs, mpp, refresh, 1)) return 1; dm_lib_release(); @@ -1452,7 +1452,7 @@ check_path (struct vectors * vecs, struct path * pp, int ticks) /* * Synchronize with kernel state */ - if (update_multipath_strings(pp->mpp, vecs->pathvec)) { + if (update_multipath_strings(pp->mpp, vecs->pathvec, 1)) { condlog(1, "%s: Could not synchronize with kernel state", pp->dev); pp->dmstate = PSTATE_UNDEF; @@ -1798,7 +1798,7 @@ configure (struct vectors * vecs, int start_waiters) /* * create new set of maps & push changed ones into dm */ - if (coalesce_paths(vecs, mpvec, NULL, 1, conf->daemon)) + if (coalesce_paths(vecs, mpvec, NULL, 1, 1)) return 1; /* @@ -1882,7 +1882,6 @@ reconfigure (struct vectors * vecs) conf->verbosity = old->verbosity; conf->bindings_read_only = old->bindings_read_only; conf->ignore_new_devs = old->ignore_new_devs; - conf->daemon = 1; configure(vecs, 1); free_config(old); retval = 0; @@ -2161,7 +2160,6 @@ child (void * param) setscheduler(); set_oom_adj(); - conf->daemon = 1; dm_udev_set_sync_support(0); #ifdef USE_SYSTEMD envp = getenv("WATCHDOG_USEC");