From patchwork Mon Mar 16 12:36:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hannes Reinecke X-Patchwork-Id: 6017761 X-Patchwork-Delegate: christophe.varoqui@free.fr 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 36A4F9F820 for ; Mon, 16 Mar 2015 12:41:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 58947204D8 for ; Mon, 16 Mar 2015 12:41:07 +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 73C5A204E1 for ; Mon, 16 Mar 2015 12:41:06 +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 t2GCcXxl005389; Mon, 16 Mar 2015 08:38:33 -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 t2GCbKqi028967 for ; Mon, 16 Mar 2015 08:37:20 -0400 Received: from mx1.redhat.com (ext-mx13.extmail.prod.ext.phx2.redhat.com [10.5.110.18]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t2GCbKDZ004278; Mon, 16 Mar 2015 08:37:20 -0400 Received: from mx2.suse.de (cantor2.suse.de [195.135.220.15]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t2GCbHZw019972 (version=TLSv1/SSLv3 cipher=DHE-RSA-CAMELLIA256-SHA bits=256 verify=FAIL); Mon, 16 Mar 2015 08:37:19 -0400 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 A801FADEF; Mon, 16 Mar 2015 12:37:10 +0000 (UTC) From: Hannes Reinecke To: Christophe Varoqui Date: Mon, 16 Mar 2015 13:36:46 +0100 Message-Id: <1426509425-15978-60-git-send-email-hare@suse.de> In-Reply-To: <1426509425-15978-1-git-send-email-hare@suse.de> References: <1426509425-15978-1-git-send-email-hare@suse.de> X-RedHat-Spam-Score: -6.909 (BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, URIBL_BLOCKED) 195.135.220.15 cantor2.suse.de 195.135.220.15 cantor2.suse.de X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Scanned-By: MIMEDefang 2.68 on 10.5.110.18 X-loop: dm-devel@redhat.com Cc: dm-devel@redhat.com Subject: [dm-devel] [PATCH 59/78] Revert to ACT_RELOAD in domap if the map exists X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk Reply-To: device-mapper development 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=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_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 ACT_CREATE checks for an existing map already, so we might as well revert to ACT_RELOAD in these cases and avoid an error during configuration. Signed-off-by: Hannes Reinecke --- libmultipath/configure.c | 16 ++++++++-------- libmultipath/devmapper.c | 5 ++++- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/libmultipath/configure.c b/libmultipath/configure.c index ef217de..24ad948 100644 --- a/libmultipath/configure.c +++ b/libmultipath/configure.c @@ -577,7 +577,7 @@ fail: extern int domap (struct multipath * mpp, char * params) { - int r = 0; + int r = DOMAP_FAIL; /* * last chance to quit before touching the devmaps @@ -587,6 +587,12 @@ domap (struct multipath * mpp, char * params) return DOMAP_DRY; } + if (mpp->action == ACT_CREATE && + dm_map_present(mpp->alias)) { + condlog(3, "%s: map already present", mpp->alias); + mpp->action = ACT_RELOAD; + } + switch (mpp->action) { case ACT_REJECT: case ACT_NOTHING: @@ -609,12 +615,6 @@ domap (struct multipath * mpp, char * params) return DOMAP_RETRY; } - if (dm_map_present(mpp->alias)) { - condlog(3, "%s: map already present", mpp->alias); - lock_multipath(mpp, 0); - break; - } - r = dm_addmap_create(mpp, params); lock_multipath(mpp, 0); @@ -650,7 +650,7 @@ domap (struct multipath * mpp, char * params) break; } - if (r) { + if (r == DOMAP_OK) { /* * DM_DEVICE_CREATE, DM_DEVICE_RENAME, or DM_DEVICE_RELOAD * succeeded diff --git a/libmultipath/devmapper.c b/libmultipath/devmapper.c index 1712c56..560d418 100644 --- a/libmultipath/devmapper.c +++ b/libmultipath/devmapper.c @@ -347,8 +347,11 @@ dm_addmap_create (struct multipath *mpp, char * params) { condlog(3, "%s: failed to load map (a path might be in use)", mpp->alias); dm_flush_map_nosync(mpp->alias); } - if (err != EROFS) + if (err != EROFS) { + condlog(3, "%s: failed to load map, error %d", + mpp->alias, err); break; + } } return 0; }