From patchwork Mon May 9 10:53:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hannes Reinecke X-Patchwork-Id: 9045011 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 48813BF29F for ; Mon, 9 May 2016 10:57:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 72C992011E for ; Mon, 9 May 2016 10:57:17 +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 8C073200E6 for ; Mon, 9 May 2016 10:57:16 +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 u49ArZjY017671; Mon, 9 May 2016 06:53:35 -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 u49ArBgW028747 for ; Mon, 9 May 2016 06:53:11 -0400 Received: from mx1.redhat.com (ext-mx05.extmail.prod.ext.phx2.redhat.com [10.5.110.29]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u49ArBEx015466 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Mon, 9 May 2016 06:53:11 -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 4D9FF552DA; Mon, 9 May 2016 10:53:10 +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 D3430ABBF; Mon, 9 May 2016 10:53:06 +0000 (UTC) From: Hannes Reinecke To: Christophe Varoqui Date: Mon, 9 May 2016 12:53:01 +0200 Message-Id: <1462791185-2903-4-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-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.27 X-Scanned-By: MIMEDefang 2.78 on 10.5.110.29 X-loop: dm-devel@redhat.com Cc: Hannes Reinecke , dm-devel@redhat.com Subject: [dm-devel] [PATCH 3/7] configure: Rename ACT_RENAME2 to ACT_FORCERENAME 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 Use a more descriptive name instead of 'ACT_RENAME2'. Signed-off-by: Hannes Reinecke --- libmultipath/configure.c | 4 ++-- libmultipath/configure.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libmultipath/configure.c b/libmultipath/configure.c index affd1d5..b976da7 100644 --- a/libmultipath/configure.c +++ b/libmultipath/configure.c @@ -398,7 +398,7 @@ select_action (struct multipath * mpp, vector curmp, int force_reload) strncpy(mpp->alias_old, cmpp->alias, WWID_SIZE); mpp->action = ACT_RENAME; if (force_reload) - mpp->action = ACT_RENAME2; + mpp->action = ACT_FORCERENAME; return; } mpp->action = ACT_CREATE; @@ -641,7 +641,7 @@ domap (struct multipath * mpp, char * params) r = dm_rename(mpp->alias_old, mpp->alias); break; - case ACT_RENAME2: + case ACT_FORCERENAME: r = dm_rename(mpp->alias_old, mpp->alias); if (r) { r = dm_addmap_reload(mpp, params); diff --git a/libmultipath/configure.h b/libmultipath/configure.h index c014b55..f357d9a 100644 --- a/libmultipath/configure.h +++ b/libmultipath/configure.h @@ -18,7 +18,7 @@ enum actions { ACT_RENAME, ACT_CREATE, ACT_RESIZE, - ACT_RENAME2, + ACT_FORCERENAME, }; #define FLUSH_ONE 1