From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <lvm2-cvs-return-4260-listarch-lvm2-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 23641 invoked by alias); 8 Jul 2011 15:35:51 -0000
Received: (qmail 23552 invoked by uid 9447); 8 Jul 2011 15:35:51 -0000
Date: Fri, 08 Jul 2011 15:35:00 -0000
Message-ID: <20110708153551.23550.qmail@sourceware.org>
From: agk@sourceware.org
To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org
Subject: LVM2/lib/activate activate.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: 2011-07/txt/msg00016.txt.bz2

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	agk@sourceware.org	2011-07-08 15:35:50

Modified files:
	lib/activate   : activate.c 

Log message:
	Need to snapshot lookup by uuid instead of name in case it's renamed.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/activate/activate.c.diff?cvsroot=lvm2&r1=1.208&r2=1.209

--- LVM2/lib/activate/activate.c	2011/07/08 12:48:41	1.208
+++ LVM2/lib/activate/activate.c	2011/07/08 15:35:50	1.209
@@ -1214,9 +1214,9 @@
 		 */
 		if (!laopts->origin_only && lv_is_origin(lv)) {
         		dm_list_iterate_items_gen(snap_seg, &lv->snapshot_segs, origin_list) {
-				if (!(lvl_pre = find_lv_in_vg(lv_pre->vg, snap_seg->cow->name))) {
-					log_error(INTERNAL_ERROR "LV %s missing from preload metadata",
-						  snap_seg->cow->name);
+				if (!(lvl_pre = find_lv_in_vg_by_lvid(lv_pre->vg, &snap_seg->cow->lvid))) {
+					log_error(INTERNAL_ERROR "LV %s (%s) missing from preload metadata",
+						  snap_seg->cow->name, snap_seg->cow->lvid.id[1].uuid);
 					goto out;
 				}
 				if (!lv_is_cow(lvl_pre->lv) &&