From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <lvm2-cvs-return-674-listarch-lvm2-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 6508 invoked by alias); 4 Jul 2006 19:52:48 -0000
Received: (qmail 6495 invoked by uid 9447); 4 Jul 2006 19:52:48 -0000
Date: Tue, 04 Jul 2006 19:52:00 -0000
Message-ID: <20060704195248.6493.qmail@sourceware.org>
From: agk@sourceware.org
To: lvm2-cvs@sourceware.org
Subject: LVM2/tools vgreduce.c
Mailing-List: contact lvm2-cvs-help@sourceware.org; run by ezmlm
Precedence: bulk
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: 2006-07/txt/msg00004.txt.bz2
List-Id: <lvm2-cvs.sourceware.org>

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	agk@sourceware.org	2006-07-04 19:52:47

Modified files:
	tools          : vgreduce.c 

Log message:
	Differentiate between the two 'log device failed' cases in vgreduce.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/vgreduce.c.diff?cvsroot=lvm2&r1=1.49&r2=1.50

--- LVM2/tools/vgreduce.c	2006/07/04 18:51:59	1.49
+++ LVM2/tools/vgreduce.c	2006/07/04 19:52:47	1.50
@@ -286,13 +286,18 @@
 				list_iterate_items(seg, &mirrored_seg->log_lv->segments) {
 					/* FIXME: The second test shouldn't be required */
 					if ((seg->segtype ==
-					     get_segtype_from_string(vg->cmd, "error")) ||
-					    (!strcmp(seg->segtype->name, "error"))) {
+					     get_segtype_from_string(vg->cmd, "error"))) {
 						log_print("The log device for %s/%s has failed.",
 							  vg->name, mirrored_seg->lv->name);
 						remove_log = 1;
 						break;
 					}
+					if (!strcmp(seg->segtype->name, "error")) {
+						log_print("Log device for %s/%s has failed.",
+							  vg->name, mirrored_seg->lv->name);
+						remove_log = 1;
+						break;
+					}
 				}
 			}