From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <lvm2-cvs-return-1861-listarch-lvm2-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 11635 invoked by alias); 23 Apr 2009 16:43:03 -0000
Received: (qmail 11617 invoked by uid 9699); 23 Apr 2009 16:43:02 -0000
Date: Thu, 23 Apr 2009 16:43:00 -0000
Message-ID: <20090423164302.11615.qmail@sourceware.org>
From: mornfall@sourceware.org
To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org
Subject: LVM2/lib/metadata mirror.c
Mailing-List: contact lvm2-cvs-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <lvm2-cvs.sourceware.org>
List-Subscribe: <mailto:lvm2-cvs-subscribe@sourceware.org>
List-Post: <mailto:lvm2-cvs@sourceware.org>
List-Help: <mailto:lvm2-cvs-help@sourceware.org>, <http://sourceware.org/lists.html#faqs>
Sender: lvm2-cvs-owner@sourceware.org
X-SW-Source: 2009-04/txt/msg00038.txt.bz2

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	mornfall@sourceware.org	2009-04-23 16:43:01

Modified files:
	lib/metadata   : mirror.c 

Log message:
	A more thorough PV equality test (that also copes better with MISSING_PVs) in
	_is_mirror_image_removable.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/mirror.c.diff?cvsroot=lvm2&r1=1.84&r2=1.85

--- LVM2/lib/metadata/mirror.c	2009/04/21 14:31:58	1.84
+++ LVM2/lib/metadata/mirror.c	2009/04/23 16:43:01	1.85
@@ -440,7 +440,12 @@
 
 			pv_found = 0;
 			dm_list_iterate_items(pvl, removable_pvs) {
-				if (pv->dev->dev == pvl->pv->dev->dev) {
+				if (id_equal(&pv->id, &pvl->pv->id)) {
+					pv_found = 1;
+					break;
+				}
+				if (pvl->pv->dev && pv->dev &&
+				    pv->dev->dev == pvl->pv->dev->dev) {
 					pv_found = 1;
 					break;
 				}