From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 25014 invoked by alias); 20 Oct 2011 10:39:08 -0000 Received: (qmail 24997 invoked by uid 9737); 20 Oct 2011 10:39:08 -0000 Date: Thu, 20 Oct 2011 10:39:00 -0000 Message-ID: <20111020103908.24995.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: List-Subscribe: List-Post: List-Help: , Sender: lvm2-cvs-owner@sourceware.org X-SW-Source: 2011-10/txt/msg00080.txt.bz2 CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: zkabelac@sourceware.org 2011-10-20 10:39:07 Modified files: libdm : libdm-deptree.c Log message: Just replace stack, return 0 with return_0 Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/libdm-deptree.c.diff?cvsroot=lvm2&r1=1.137&r2=1.138 --- LVM2/libdm/libdm-deptree.c 2011/10/20 10:35:55 1.137 +++ LVM2/libdm/libdm-deptree.c 2011/10/20 10:39:07 1.138 @@ -2266,19 +2266,13 @@ return_0; /* FIXME Cope if name exists with no uuid? */ - if (!child->info.exists) { - if (!_create_node(child)) { - stack; - return 0; - } - } + if (!child->info.exists && !_create_node(child)) + return_0; - if (!child->info.inactive_table && child->props.segment_count) { - if (!_load_node(child)) { - stack; - return 0; - } - } + if (!child->info.inactive_table && + child->props.segment_count && + !_load_node(child)) + return_0; /* Propagate device size change change */ if (child->props.size_changed)