From patchwork Mon May 4 18:12:07 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: bmarzins@sourceware.org X-Patchwork-Id: 21761 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 n44ICZXQ026990 for ; Mon, 4 May 2009 18:12:35 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 629C0619CCE; Mon, 4 May 2009 14:12:34 -0400 (EDT) Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by listman.util.phx.redhat.com (8.13.1/8.13.1) with ESMTP id n44ICWVs028881 for ; Mon, 4 May 2009 14:12:32 -0400 Received: from mx1.redhat.com (mx1.redhat.com [172.16.48.31]) by int-mx1.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n44ICVKE021150 for ; Mon, 4 May 2009 14:12:31 -0400 Received: from sourceware.org (sourceware.org [209.132.176.174]) by mx1.redhat.com (8.13.8/8.13.8) with SMTP id n44IC8Hi022927 for ; Mon, 4 May 2009 14:12:08 -0400 Received: (qmail 5598 invoked by uid 9475); 4 May 2009 18:12:07 -0000 Date: 4 May 2009 18:12:07 -0000 Message-ID: <20090504181207.5596.qmail@sourceware.org> From: bmarzins@sourceware.org To: dm-cvs@sourceware.org, dm-devel@redhat.com X-RedHat-Spam-Score: -4 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 X-Scanned-By: MIMEDefang 2.63 on 172.16.48.31 X-loop: dm-devel@redhat.com Cc: Subject: [dm-devel] multipath-tools libmultipath/devmapper.c multi ... X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.5 Precedence: junk Reply-To: device-mapper development List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com CVSROOT: /cvs/dm Module name: multipath-tools Branch: RHEL5_FC6 Changes by: bmarzins@sourceware.org 2009-05-04 18:12:07 Modified files: libmultipath : devmapper.c multipath : main.c Log message: Fix for bz #477023. Fix for multipath -F return codes ported from upstream. Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/multipath-tools/libmultipath/devmapper.c.diff?cvsroot=dm&only_with_tag=RHEL5_FC6&r1=1.22.2.7&r2=1.22.2.8 http://sourceware.org/cgi-bin/cvsweb.cgi/multipath-tools/multipath/main.c.diff?cvsroot=dm&only_with_tag=RHEL5_FC6&r1=1.44.2.6&r2=1.44.2.7 --- dm-devel mailing list dm-devel@redhat.com https://www.redhat.com/mailman/listinfo/dm-devel --- multipath-tools/libmultipath/devmapper.c 2009/04/03 15:09:02 1.22.2.7 +++ multipath-tools/libmultipath/devmapper.c 2009/05/04 18:12:06 1.22.2.8 @@ -465,7 +465,7 @@ return 0; if (dm_type(mapname, type) <= 0) - return 1; + return 0; if (dm_remove_partmaps(mapname)) return 1; @@ -507,7 +507,7 @@ goto out; do { - r += dm_flush_map(names->name, type); + r |= dm_flush_map(names->name, type); next = names->next; names = (void *) names + next; } while (next); --- multipath-tools/multipath/main.c 2008/08/22 21:55:43 1.44.2.6 +++ multipath-tools/multipath/main.c 2009/05/04 18:12:07 1.44.2.7 @@ -1,7 +1,7 @@ /* * Soft: multipath device mapper target autoconfig * - * Version: $Id: main.c,v 1.44.2.6 2008/08/22 21:55:43 bmarzins Exp $ + * Version: $Id: main.c,v 1.44.2.7 2009/05/04 18:12:07 bmarzins Exp $ * * Author: Christophe Varoqui * @@ -404,14 +404,14 @@ if (conf->remove == FLUSH_ONE) { if (conf->dev_type == DEV_DEVMAP) - dm_flush_map(conf->dev, DEFAULT_TARGET); + r = dm_flush_map(conf->dev, DEFAULT_TARGET); else condlog(0, "must provide a map name to remove"); goto out; } else if (conf->remove == FLUSH_ALL) { - dm_flush_maps(DEFAULT_TARGET); + r = dm_flush_maps(DEFAULT_TARGET); goto out; } while ((r = configure()) < 0)