From patchwork Mon May 9 10:53:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hannes Reinecke X-Patchwork-Id: 9044971 X-Patchwork-Delegate: snitzer@redhat.com 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E6EDD9F1C3 for ; Mon, 9 May 2016 10:56:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 119F52011E for ; Mon, 9 May 2016 10:56:24 +0000 (UTC) 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.kernel.org (Postfix) with ESMTPS id 05BB7200E6 for ; Mon, 9 May 2016 10:56:22 +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 u49Ara8X017681; Mon, 9 May 2016 06:53:36 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id u49ArD5S028761 for ; Mon, 9 May 2016 06:53:13 -0400 Received: from mx1.redhat.com (ext-mx10.extmail.prod.ext.phx2.redhat.com [10.5.110.39]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u49ArDl1001532 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Mon, 9 May 2016 06:53:13 -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 58F7563301; Mon, 9 May 2016 10:53:08 +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 D7E53ABF5; Mon, 9 May 2016 10:53:06 +0000 (UTC) From: Hannes Reinecke To: Christophe Varoqui Date: Mon, 9 May 2016 12:53:04 +0200 Message-Id: <1462791185-2903-7-git-send-email-hare@suse.de> In-Reply-To: <1462791185-2903-1-git-send-email-hare@suse.de> References: <1462791185-2903-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.39]); Mon, 09 May 2016 10:53:08 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Mon, 09 May 2016 10:53:08 +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.98 (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.22 X-Scanned-By: MIMEDefang 2.78 on 10.5.110.39 X-loop: dm-devel@redhat.com Cc: Hannes Reinecke , dm-devel@redhat.com Subject: [dm-devel] [PATCH 6/7] devmapper: remove 'udev_sync' argument from dm_simplecmd_noflush() 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-Spam-Status: No, score=-6.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 The 'udev_sync' argument is always '1', so we can remove it. Signed-off-by: Hannes Reinecke --- libmultipath/configure.c | 4 ++-- libmultipath/devmapper.c | 9 +++++---- libmultipath/devmapper.h | 2 +- multipathd/cli_handlers.c | 4 ++-- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/libmultipath/configure.c b/libmultipath/configure.c index 9c6904a..708dae8 100644 --- a/libmultipath/configure.c +++ b/libmultipath/configure.c @@ -628,7 +628,7 @@ domap (struct multipath * mpp, char * params) r = dm_addmap_reload(mpp, params); if (r) r = dm_simplecmd_noflush(DM_DEVICE_RESUME, mpp->alias, - 1, MPATH_UDEV_RELOAD_FLAG); + MPATH_UDEV_RELOAD_FLAG); break; case ACT_RESIZE: @@ -647,7 +647,7 @@ domap (struct multipath * mpp, char * params) r = dm_addmap_reload(mpp, params); if (r) r = dm_simplecmd_noflush(DM_DEVICE_RESUME, - mpp->alias, 1, + mpp->alias, MPATH_UDEV_RELOAD_FLAG); } break; diff --git a/libmultipath/devmapper.c b/libmultipath/devmapper.c index 8a89f46..6983ab6 100644 --- a/libmultipath/devmapper.c +++ b/libmultipath/devmapper.c @@ -254,8 +254,8 @@ dm_simplecmd_flush (int task, const char *name, uint16_t udev_flags) { } extern int -dm_simplecmd_noflush (int task, const char *name, int needsync, uint16_t udev_flags) { - return dm_simplecmd(task, name, 1, needsync, udev_flags, 0); +dm_simplecmd_noflush (int task, const char *name, uint16_t udev_flags) { + return dm_simplecmd(task, name, 1, 1, udev_flags, 0); } static int @@ -847,7 +847,7 @@ dm_suspend_and_flush_map (const char * mapname) return 0; } condlog(2, "failed to remove multipath map %s", mapname); - dm_simplecmd_noflush(DM_DEVICE_RESUME, mapname, 1, 0); + dm_simplecmd_noflush(DM_DEVICE_RESUME, mapname, 0); if (queue_if_no_path) s = dm_queue_if_no_path((char *)mapname, 1); return 1; @@ -1486,7 +1486,8 @@ int dm_reassign_table(const char *name, char *old, char *new) condlog(3, "%s: failed to reassign targets", name); goto out_reload; } - dm_simplecmd_noflush(DM_DEVICE_RESUME, name, 1, MPATH_UDEV_RELOAD_FLAG); + dm_simplecmd_noflush(DM_DEVICE_RESUME, name, + MPATH_UDEV_RELOAD_FLAG); } r = 1; diff --git a/libmultipath/devmapper.h b/libmultipath/devmapper.h index 8dd0963..bc13b07 100644 --- a/libmultipath/devmapper.h +++ b/libmultipath/devmapper.h @@ -16,7 +16,7 @@ void dm_init(void); int dm_prereq (void); int dm_drv_version (unsigned int * version, char * str); int dm_simplecmd_flush (int, const char *, uint16_t); -int dm_simplecmd_noflush (int, const char *, int, uint16_t); +int dm_simplecmd_noflush (int, const char *, uint16_t); int dm_addmap_create (struct multipath *mpp, char *params); int dm_addmap_reload (struct multipath *mpp, char *params); int dm_map_present (const char *); diff --git a/multipathd/cli_handlers.c b/multipathd/cli_handlers.c index 5112786..8b3cb9d 100644 --- a/multipathd/cli_handlers.c +++ b/multipathd/cli_handlers.c @@ -937,7 +937,7 @@ cli_suspend(void * v, char ** reply, int * len, void * data) return 1; } - r = dm_simplecmd_noflush(DM_DEVICE_SUSPEND, param, 0, 0); + r = dm_simplecmd_noflush(DM_DEVICE_SUSPEND, param, 0); condlog(2, "%s: suspend (operator)", param); @@ -967,7 +967,7 @@ cli_resume(void * v, char ** reply, int * len, void * data) return 1; } - r = dm_simplecmd_noflush(DM_DEVICE_RESUME, param, 1, 0); + r = dm_simplecmd_noflush(DM_DEVICE_RESUME, param, 0); condlog(2, "%s: resume (operator)", param);