From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <lvm2-cvs-return-5282-listarch-lvm2-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 18184 invoked by alias); 4 Mar 2012 16:05:43 -0000
Received: (qmail 18167 invoked by uid 9737); 4 Mar 2012 16:05:42 -0000
Date: Sun, 04 Mar 2012 16:05:00 -0000
Message-ID: <20120304160542.18165.qmail@sourceware.org>
From: zkabelac@sourceware.org
To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org
Subject: LVM2/libdm libdm-deptree.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: 2012-03/txt/msg00061.txt.bz2

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	zkabelac@sourceware.org	2012-03-04 16:05:42

Modified files:
	libdm          : libdm-deptree.c 

Log message:
	Remove part of FIXME
	
	(and reindent a code below)

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/libdm-deptree.c.diff?cvsroot=lvm2&r1=1.161&r2=1.162

--- LVM2/libdm/libdm-deptree.c	2012/03/02 21:53:17	1.161
+++ LVM2/libdm/libdm-deptree.c	2012/03/04 16:05:42	1.162
@@ -1590,16 +1590,12 @@
 
 		if (child->callback &&
 		    !child->callback(child, DM_NODE_CALLBACK_DEACTIVATED,
-				     child->callback_data)) {
-			r = 0;
-			// FIXME: break tree shutdown or continue?
-			// hmm what about _node_clear_table()?
-		}
+				     child->callback_data))
+			r = 0; // FIXME: _node_clear_table() without callback ?
 
-		if (dm_tree_node_num_children(child, 0)) {
-			if (!_dm_tree_deactivate_children(child, uuid_prefix, uuid_prefix_len, level + 1))
-				return_0;
-		}
+		if (dm_tree_node_num_children(child, 0) &&
+		    !_dm_tree_deactivate_children(child, uuid_prefix, uuid_prefix_len, level + 1))
+			return_0;
 	}
 
 	return r;