From patchwork Tue May 9 16:57:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Marzinski X-Patchwork-Id: 9718701 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 00E2460237 for ; Tue, 9 May 2017 16:57:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F166720008 for ; Tue, 9 May 2017 16:57:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E61EF201A4; Tue, 9 May 2017 16:57:38 +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 mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (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 859B120008 for ; Tue, 9 May 2017 16:57:37 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5DB496408F; Tue, 9 May 2017 16:57:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 5DB496408F Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=dm-devel-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 5DB496408F Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3F44618A54; Tue, 9 May 2017 16:57:36 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id F09CF1800C8F; Tue, 9 May 2017 16:57:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v49GvJXG016108 for ; Tue, 9 May 2017 12:57:19 -0400 Received: by smtp.corp.redhat.com (Postfix) id 88A0917B69; Tue, 9 May 2017 16:57:19 +0000 (UTC) Delivered-To: dm-devel@redhat.com Received: from redhat.com (octiron.msp.redhat.com [10.15.80.209]) by smtp.corp.redhat.com (Postfix) with SMTP id 419CA179FD; Tue, 9 May 2017 16:57:18 +0000 (UTC) Received: by redhat.com (sSMTP sendmail emulation); Tue, 09 May 2017 11:57:17 -0500 From: "Benjamin Marzinski" To: device-mapper development Date: Tue, 9 May 2017 11:57:02 -0500 Message-Id: <1494349025-6561-4-git-send-email-bmarzins@redhat.com> In-Reply-To: <1494349025-6561-1-git-send-email-bmarzins@redhat.com> References: <1494349025-6561-1-git-send-email-bmarzins@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: dm-devel@redhat.com Subject: [dm-devel] [PATCH 3/6] libmultipath: refactor calls to get dm device info 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-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Tue, 09 May 2017 16:57:36 +0000 (UTC) X-Virus-Scanned: ClamAV using ClamSMTP Multipath has a number of functions that all do basically the same thing to get members of the dm_info structure. This just refactors them to use common code to do it. Signed-off-by: Benjamin Marzinski Reviewed-by: Martin Wilck --- libmultipath/devmapper.c | 171 +++++++++------------------------------------- libmultipath/devmapper.h | 3 +- multipathd/cli_handlers.c | 24 ++----- 3 files changed, 42 insertions(+), 156 deletions(-) diff --git a/libmultipath/devmapper.c b/libmultipath/devmapper.c index 1c6b87e..2c4a13a 100644 --- a/libmultipath/devmapper.c +++ b/libmultipath/devmapper.c @@ -399,16 +399,16 @@ int dm_addmap_reload(struct multipath *mpp, char *params, int flush) return r; } -int dm_map_present(const char * str) +static int +do_get_info(const char *name, struct dm_info *info) { - int r = 0; + int r = -1; struct dm_task *dmt; - struct dm_info info; if (!(dmt = dm_task_create(DM_DEVICE_INFO))) - return 0; + return r; - if (!dm_task_set_name(dmt, str)) + if (!dm_task_set_name(dmt, name)) goto out; dm_task_no_open_count(dmt); @@ -416,16 +416,25 @@ int dm_map_present(const char * str) if (!dm_task_run(dmt)) goto out; - if (!dm_task_get_info(dmt, &info)) + if (!dm_task_get_info(dmt, info)) goto out; - if (info.exists) - r = 1; + if (!info->exists) + goto out; + + r = 0; out: dm_task_destroy(dmt); return r; } +int dm_map_present(const char * str) +{ + struct dm_info info; + + return (do_get_info(str, &info) == 0); +} + int dm_get_map(const char *name, unsigned long long *size, char *outparams) { int r = 1; @@ -646,29 +655,15 @@ out: static int dm_dev_t (const char * mapname, char * dev_t, int len) { - int r = 1; - struct dm_task *dmt; struct dm_info info; - if (!(dmt = dm_task_create(DM_DEVICE_INFO))) - return 0; - - if (!dm_task_set_name(dmt, mapname)) - goto out; - - if (!dm_task_run(dmt)) - goto out; - - if (!dm_task_get_info(dmt, &info) || !info.exists) - goto out; + if (do_get_info(mapname, &info) != 0) + return 1; if (snprintf(dev_t, len, "%i:%i", info.major, info.minor) > len) - goto out; + return 1; - r = 0; -out: - dm_task_destroy(dmt); - return r; + return 0; } int @@ -700,59 +695,16 @@ out: } int -dm_get_major (char * mapname) +dm_get_major_minor(const char *name, int *major, int *minor) { - int r = -1; - struct dm_task *dmt; struct dm_info info; - if (!(dmt = dm_task_create(DM_DEVICE_INFO))) - return 0; - - if (!dm_task_set_name(dmt, mapname)) - goto out; - - if (!dm_task_run(dmt)) - goto out; - - if (!dm_task_get_info(dmt, &info)) - goto out; - - if (!info.exists) - goto out; - - r = info.major; -out: - dm_task_destroy(dmt); - return r; -} - -int -dm_get_minor (char * mapname) -{ - int r = -1; - struct dm_task *dmt; - struct dm_info info; - - if (!(dmt = dm_task_create(DM_DEVICE_INFO))) - return 0; - - if (!dm_task_set_name(dmt, mapname)) - goto out; - - if (!dm_task_run(dmt)) - goto out; - - if (!dm_task_get_info(dmt, &info)) - goto out; - - if (!info.exists) - goto out; + if (do_get_info(name, &info) != 0) + return -1; - r = info.minor; -out: - dm_task_destroy(dmt); - return r; + *major = info.major; + *minor = info.minor; + return 0; } static int @@ -1070,31 +1022,12 @@ out: int dm_geteventnr (char *name) { - struct dm_task *dmt; struct dm_info info; - int event = -1; - if (!(dmt = dm_task_create(DM_DEVICE_INFO))) + if (do_get_info(name, &info) != 0) return -1; - if (!dm_task_set_name(dmt, name)) - goto out; - - dm_task_no_open_count(dmt); - - if (!dm_task_run(dmt)) - goto out; - - if (!dm_task_get_info(dmt, &info)) - goto out; - - if (info.exists) - event = info.event_nr; - -out: - dm_task_destroy(dmt); - - return event; + return info.event_nr; } char * @@ -1262,26 +1195,12 @@ cancel_remove_partmap (const char *name, void *unused) static int dm_get_deferred_remove (char * mapname) { - int r = -1; - struct dm_task *dmt; struct dm_info info; - if (!(dmt = dm_task_create(DM_DEVICE_INFO))) + if (do_get_info(mapname, &info) != 0) return -1; - if (!dm_task_set_name(dmt, mapname)) - goto out; - - if (!dm_task_run(dmt)) - goto out; - - if (!dm_task_get_info(dmt, &info)) - goto out; - - r = info.deferred_remove; -out: - dm_task_destroy(dmt); - return r; + return info.deferred_remove; } static int @@ -1328,9 +1247,6 @@ alloc_dminfo (void) int dm_get_info (char * mapname, struct dm_info ** dmi) { - int r = 1; - struct dm_task *dmt = NULL; - if (!mapname) return 1; @@ -1340,32 +1256,13 @@ dm_get_info (char * mapname, struct dm_info ** dmi) if (!*dmi) return 1; - if (!(dmt = dm_task_create(DM_DEVICE_INFO))) - goto out; - - if (!dm_task_set_name(dmt, mapname)) - goto out; - - dm_task_no_open_count(dmt); - - if (!dm_task_run(dmt)) - goto out; - - if (!dm_task_get_info(dmt, *dmi)) - goto out; - - r = 0; -out: - if (r) { + if (do_get_info(mapname, *dmi) != 0) { memset(*dmi, 0, sizeof(struct dm_info)); FREE(*dmi); *dmi = NULL; + return 1; } - - if (dmt) - dm_task_destroy(dmt); - - return r; + return 0; } struct rename_data { diff --git a/libmultipath/devmapper.h b/libmultipath/devmapper.h index aca4454..5b66865 100644 --- a/libmultipath/devmapper.h +++ b/libmultipath/devmapper.h @@ -52,8 +52,7 @@ int dm_enablegroup(char * mapname, int index); int dm_disablegroup(char * mapname, int index); int dm_get_maps (vector mp); int dm_geteventnr (char *name); -int dm_get_major (char *name); -int dm_get_minor (char *name); +int dm_get_major_minor (const char *name, int *major, int *minor); char * dm_mapname(int major, int minor); int dm_remove_partmaps (const char * mapname, int need_sync, int deferred_remove); diff --git a/multipathd/cli_handlers.c b/multipathd/cli_handlers.c index d598039..04c7386 100644 --- a/multipathd/cli_handlers.c +++ b/multipathd/cli_handlers.c @@ -746,7 +746,7 @@ cli_add_map (void * v, char ** reply, int * len, void * data) char * param = get_keyparam(v, MAP); int major, minor; char dev_path[PATH_SIZE]; - char *alias, *refwwid; + char *refwwid, *alias = NULL; int rc, count = 0; struct config *conf; @@ -763,14 +763,12 @@ cli_add_map (void * v, char ** reply, int * len, void * data) } put_multipath_config(conf); do { - minor = dm_get_minor(param); - if (minor < 0) + if (dm_get_major_minor(param, &major, &minor) < 0) condlog(2, "%s: not a device mapper table", param); - major = dm_get_major(param); - if (major < 0) - condlog(2, "%s: not a device mapper table", param); - sprintf(dev_path, "dm-%d", minor); - alias = dm_mapname(major, minor); + else { + sprintf(dev_path, "dm-%d", minor); + alias = dm_mapname(major, minor); + } /*if there is no mapname found, we first create the device*/ if (!alias && !count) { condlog(2, "%s: mapname not found for %d:%d", @@ -804,23 +802,15 @@ cli_del_map (void * v, char ** reply, int * len, void * data) struct vectors * vecs = (struct vectors *)data; char * param = get_keyparam(v, MAP); int major, minor; - char dev_path[PATH_SIZE]; char *alias; int rc; param = convert_dev(param, 0); condlog(2, "%s: remove map (operator)", param); - minor = dm_get_minor(param); - if (minor < 0) { - condlog(2, "%s: not a device mapper table", param); - return 1; - } - major = dm_get_major(param); - if (major < 0) { + if (dm_get_major_minor(param, &major, &minor) < 0) { condlog(2, "%s: not a device mapper table", param); return 1; } - sprintf(dev_path,"dm-%d", minor); alias = dm_mapname(major, minor); if (!alias) { condlog(2, "%s: mapname not found for %d:%d",