From patchwork Thu Mar 26 03:28:10 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: 14467 X-Patchwork-Delegate: bmarzins@redhat.com 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 n2Q3SUWh030646 for ; Thu, 26 Mar 2009 03:28:31 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 4DB85618CE9; Wed, 25 Mar 2009 23:28:30 -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 n2Q3SSMa005891 for ; Wed, 25 Mar 2009 23:28:29 -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 n2Q3SXQv032262 for ; Wed, 25 Mar 2009 23:28:33 -0400 Received: from sourceware.org (sourceware.org [209.132.176.174]) by mx1.redhat.com (8.13.8/8.13.8) with SMTP id n2Q3SBkp022915 for ; Wed, 25 Mar 2009 23:28:11 -0400 Received: (qmail 5959 invoked by uid 9475); 26 Mar 2009 03:28:10 -0000 Date: 26 Mar 2009 03:28:10 -0000 Message-ID: <20090326032810.5957.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/structs_vec.c mul ... 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-03-26 03:28:10 Modified files: libmultipath : structs_vec.c multipathd : main.c Log message: Fix for bz #452897 Make sure that multipath modifying a map doesn't clear out the map's hardware entry. Not applicable to upstream. Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/multipath-tools/libmultipath/structs_vec.c.diff?cvsroot=dm&only_with_tag=RHEL5_FC6&r1=1.1.2.3&r2=1.1.2.4 http://sourceware.org/cgi-bin/cvsweb.cgi/multipath-tools/multipathd/main.c.diff?cvsroot=dm&only_with_tag=RHEL5_FC6&r1=1.69.2.14&r2=1.69.2.15 --- dm-devel mailing list dm-devel@redhat.com https://www.redhat.com/mailman/listinfo/dm-devel --- multipath-tools/libmultipath/structs_vec.c 2008/09/04 20:09:48 1.1.2.3 +++ multipath-tools/libmultipath/structs_vec.c 2009/03/26 03:28:09 1.1.2.4 @@ -377,10 +377,16 @@ /* * see if path is in sysfs */ - if (!pp->dev || sysfs_get_dev(sysfs_path, - pp->dev, pp->dev_t, BLK_DEV_SIZE)) { - condlog(0, "%s: failed to access path %s", mpp->alias, - pp->dev ? pp->dev : pp->dev_t); + if (!(*pp->dev) || + sysfs_get_dev(sysfs_path, pp->dev, pp->dev_t, + BLK_DEV_SIZE)) { + if (!(*pp->dev)) + condlog(3, + "%s: removing path %s with no devname", + mpp->alias, pp->dev_t); + else + condlog(0, "%s: failed to access path %s", + mpp->alias, pp->dev); count++; vector_del_slot(mpp->paths, i); i--; --- multipath-tools/multipathd/main.c 2008/09/19 03:27:08 1.69.2.14 +++ multipath-tools/multipathd/main.c 2009/03/26 03:28:09 1.69.2.15 @@ -411,6 +411,7 @@ return 1; /* leave path added to pathvec */ verify_paths(mpp, vecs, NULL); + mpp->hwe = pp->hwe; mpp->flush_on_last_del = FLUSH_UNDEF; mpp->action = ACT_RELOAD; }