From patchwork Tue Oct 20 19:50:34 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Benjamin Marzinski <bmarzins@redhat.com>
X-Patchwork-Id: 55007
X-Patchwork-Delegate: christophe.varoqui@free.fr
Received: from hormel.redhat.com (hormel1.redhat.com [209.132.177.33])
	by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n9KK2QnU026488
	for <patchwork-dm-devel@patchwork.kernel.org>;
	Tue, 20 Oct 2009 20:02:27 GMT
Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com
	[10.8.4.110])
	by hormel.redhat.com (Postfix) with ESMTP id 93FED618EFE;
	Tue, 20 Oct 2009 16:02:26 -0400 (EDT)
Received: from int-mx05.intmail.prod.int.phx2.redhat.com
	(nat-pool.util.phx.redhat.com [10.8.5.200])
	by listman.util.phx.redhat.com (8.13.1/8.13.1) with ESMTP id
	n9KK2OEK029409 for <dm-devel@listman.util.phx.redhat.com>;
	Tue, 20 Oct 2009 16:02:24 -0400
Received: from ether.msp.redhat.com (ether.msp.redhat.com [10.15.80.119])
	by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with
	ESMTP id n9KK2Np5010708
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO)
	for <dm-devel@redhat.com>; Tue, 20 Oct 2009 16:02:24 -0400
Received: from ether.msp.redhat.com (localhost.localdomain [127.0.0.1])
	by ether.msp.redhat.com (8.14.1/8.14.1) with ESMTP id n9KJoYDN011742
	for <dm-devel@redhat.com>; Tue, 20 Oct 2009 14:50:34 -0500
Received: (from bmarzins@localhost)
	by ether.msp.redhat.com (8.14.1/8.14.1/Submit) id n9KJoYEv011741
	for dm-devel@redhat.com; Tue, 20 Oct 2009 14:50:34 -0500
Date: Tue, 20 Oct 2009 14:50:34 -0500
From: Benjamin Marzinski <bmarzins@redhat.com>
To: device-mapper development <dm-devel@redhat.com>
Message-ID: <20091020195034.GR3555@ether.msp.redhat.com>
MIME-Version: 1.0
Content-Disposition: inline
User-Agent: Mutt/1.5.17 (2007-11-01)
X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18
X-loop: dm-devel@redhat.com
Subject: [dm-devel] [PATCH] multipath-tools: Fix dry runs to identify renames
X-BeenThere: dm-devel@redhat.com
X-Mailman-Version: 2.1.5
Precedence: junk
Reply-To: device-mapper development <dm-devel@redhat.com>
List-Id: device-mapper development <dm-devel.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/listinfo/dm-devel>,
	<mailto:dm-devel-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/dm-devel>
List-Post: <mailto:dm-devel@redhat.com>
List-Help: <mailto:dm-devel-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/dm-devel>,
	<mailto:dm-devel-request@redhat.com?subject=subscribe>
Sender: dm-devel-bounces@redhat.com
Errors-To: dm-devel-bounces@redhat.com


Index: multipath-tools-091013/libmultipath/configure.c
===================================================================
--- multipath-tools-091013.orig/libmultipath/configure.c
+++ multipath-tools-091013/libmultipath/configure.c
@@ -151,7 +151,7 @@ select_action (struct multipath * mpp, v
 	if (!cmpp) {
 		cmpp = find_mp_by_wwid(curmp, mpp->wwid);
 
-		if (cmpp && !conf->dry_run) {
+		if (cmpp) {
 			condlog(2, "%s: rename %s to %s", mpp->wwid,
 				cmpp->alias, mpp->alias);
 			strncpy(mpp->alias_old, cmpp->alias, WWID_SIZE);