From patchwork Wed May 4 05:57: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: 9010021 X-Patchwork-Delegate: snitzer@redhat.com Return-Path: X-Original-To: patchwork-dm-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 0D777BF29F for ; Wed, 4 May 2016 06:01:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 062B920377 for ; Wed, 4 May 2016 06:01:39 +0000 (UTC) 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.kernel.org (Postfix) with ESMTPS id E2465202EC for ; Wed, 4 May 2016 06:01:37 +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 u445vgKt017678; Wed, 4 May 2016 01:57:42 -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 u445vfdZ006144 for ; Wed, 4 May 2016 01:57:41 -0400 Received: from mx1.redhat.com (ext-mx02.extmail.prod.ext.phx2.redhat.com [10.5.110.26]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u445vfDY002701 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Wed, 4 May 2016 01:57:41 -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 49A907F08F; Wed, 4 May 2016 05:57:33 +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 EDCFFAD92; Wed, 4 May 2016 05:57:31 +0000 (UTC) From: Hannes Reinecke To: Christophe Varoqui Date: Wed, 4 May 2016 07:57:27 +0200 Message-Id: <1462341450-5507-4-git-send-email-hare@suse.de> In-Reply-To: <1462341450-5507-1-git-send-email-hare@suse.de> References: <1462341450-5507-1-git-send-email-hare@suse.de> 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.26 X-Scanned-By: MIMEDefang 2.75 on 10.5.110.26 X-loop: dm-devel@redhat.com Cc: Hannes Reinecke , dm-devel@redhat.com Subject: [dm-devel] [PATCH 3/6] Remove 'udev_sync' argument from dm_simplecmd() 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=-9.0 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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' attribute is pointless without a cookie, so we can as well use the existence of the 'cookie' argument for the same function. Signed-off-by: Hannes Reinecke --- libmultipath/devmapper.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/libmultipath/devmapper.c b/libmultipath/devmapper.c index ab71fda..9facbb9 100644 --- a/libmultipath/devmapper.c +++ b/libmultipath/devmapper.c @@ -207,12 +207,10 @@ dm_prereq (void) #define do_deferred(x) ((x) == DEFERRED_REMOVE_ON || (x) == DEFERRED_REMOVE_IN_PROGRESS) static int -dm_simplecmd (int task, const char *name, int no_flush, int need_sync, +dm_simplecmd (int task, const char *name, int no_flush, uint16_t udev_flags, int deferred_remove, uint32_t *cookie) { int r = 0; - int udev_wait_flag = (need_sync && (task == DM_DEVICE_RESUME || - task == DM_DEVICE_REMOVE)); struct dm_task *dmt; if (!(dmt = dm_task_create (task))) @@ -231,7 +229,7 @@ dm_simplecmd (int task, const char *name, int no_flush, int need_sync, if (do_deferred(deferred_remove)) dm_task_deferred_remove(dmt); #endif - if (udev_wait_flag && + if (cookie && !dm_task_set_cookie(dmt, cookie, DM_UDEV_DISABLE_LIBRARY_FALLBACK | udev_flags)) { dm_udev_complete(*cookie); @@ -239,7 +237,7 @@ dm_simplecmd (int task, const char *name, int no_flush, int need_sync, } r = dm_task_run (dmt); - if (udev_wait_flag) { + if (cookie) { if (!r) dm_udev_complete(*cookie); else @@ -254,22 +252,27 @@ extern int dm_simplecmd_flush (int task, const char *name, uint16_t udev_flags) { uint32_t cookie = 0; - return dm_simplecmd(task, name, 0, 1, udev_flags, 0, &cookie); + if (task == DM_DEVICE_RESUME || + task == DM_DEVICE_REMOVE) + return dm_simplecmd(task, name, 0, udev_flags, 0, &cookie); + else + return dm_simplecmd(task, name, 0, udev_flags, 0, NULL); } extern int dm_simplecmd_noflush (int task, const char *name, int needsync, uint16_t udev_flags) { uint32_t cookie = 0; - return dm_simplecmd(task, name, 1, needsync, udev_flags, 0, &cookie); + return dm_simplecmd(task, name, 1, udev_flags, 0, + needsync ? &cookie : NULL); } static int dm_device_remove (const char *name, int needsync, int deferred_remove) { uint32_t cookie = 0; - return dm_simplecmd(DM_DEVICE_REMOVE, name, 0, needsync, 0, - deferred_remove, &cookie); + return dm_simplecmd(DM_DEVICE_REMOVE, name, 0, 0, + deferred_remove, needsync ? &cookie : NULL); } static int