From mboxrd@z Thu Jan 1 00:00:00 1970 From: lhh@sourceware.org Date: 16 Jun 2006 20:11:51 -0000 Subject: [Cluster-devel] cluster/rgmanager ChangeLog src/daemons/restree.c Message-ID: <20060616201151.8529.qmail@sourceware.org> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit CVSROOT: /cvs/cluster Module name: cluster Branch: STABLE Changes by: lhh at sourceware.org 2006-06-16 20:11:51 Modified files: rgmanager : ChangeLog rgmanager/src/daemons: restree.c Log message: Fix #193859 Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/ChangeLog.diff?cvsroot=cluster&only_with_tag=STABLE&r1=1.5.2.13.6.1&r2=1.5.2.13.6.2 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/restree.c.diff?cvsroot=cluster&only_with_tag=STABLE&r1=1.10.2.2.6.6&r2=1.10.2.2.6.7 --- cluster/rgmanager/ChangeLog 2006/06/16 20:07:45 1.5.2.13.6.1 +++ cluster/rgmanager/ChangeLog 2006/06/16 20:11:51 1.5.2.13.6.2 @@ -2,6 +2,8 @@ * src/daemons/fo_domain.c, groups.c: Get rid of compiler warnings * src/daemons/rg_state.c: Change clu_lock_verbose to use the NULL lock/convert mechanism offered by DLM to work around #193128 + * src/daemons/restree.c: Apply patch from Navid Sheikhol-Eslami + (navid at redhat.com) to fix #193859 * src/resources/fs.sh, clusterfs.sh, nfsexport.sh, nfsclient.sh, service.sh, svclib_nfslock: Finish up initial NFS workaround. --- cluster/rgmanager/src/daemons/restree.c 2006/06/16 20:07:46 1.10.2.2.6.6 +++ cluster/rgmanager/src/daemons/restree.c 2006/06/16 20:11:51 1.10.2.2.6.7 @@ -702,18 +702,18 @@ #endif /* Do op on all children at our level */ - rv = _res_op(&node->rn_child, first, + rv += _res_op(&node->rn_child, first, rule->rr_childtypes[x].rc_name, ret, op); - if (rv != 0) + if (rv != 0 && op != RS_STOP) return rv; } - if (rv != 0) + if (rv != 0 && op != RS_STOP) return rv; } - return 0; + return rv; }