diff --git a/doc/private/SRCID b/doc/private/SRCID index 18e217091a..0b66dbc3eb 100644 --- a/doc/private/SRCID +++ b/doc/private/SRCID @@ -1,6 +1,6 @@ -# $Id: SRCID,v 1.1195 2012/02/15 22:16:52 tbox Exp $ +# $Id: SRCID,v 1.1196 2012/02/17 01:16:31 tbox Exp $ # # This file must follow /bin/sh rules. It is imported directly via # configure. # -SRCID="( $Date: 2012/02/15 22:16:52 $ )" +SRCID="( $Date: 2012/02/17 01:16:31 $ )" diff --git a/doc/private/branches b/doc/private/branches index 6a0531acf7..b6194db166 100644 --- a/doc/private/branches +++ b/doc/private/branches @@ -442,6 +442,7 @@ rt26632 new marka // 2011-11-30 05:18 +0000 rt26676 new each // 2011-12-08 19:52 +0000 rt26676alt new marka // 2011-12-21 06:32 +0000 rt26677 new marka // 2011-11-29 23:26 +0000 +rt26786 new each // 2012-02-16 16:17 +0000 rt26805 new marka // 2012-01-23 04:28 +0000 rt26830 new marka // 2011-11-30 22:58 +0000 rt26845 new marka // 2011-12-08 09:35 +0000 diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c index b043fee404..a6422f219f 100644 --- a/lib/dns/rbtdb.c +++ b/lib/dns/rbtdb.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: rbtdb.c,v 1.329 2012/02/15 02:00:47 marka Exp $ */ +/* $Id: rbtdb.c,v 1.330 2012/02/17 00:18:18 marka Exp $ */ /*! \file */ @@ -1643,6 +1643,8 @@ reactivate_node(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node, nodelock_t *nodelock = &rbtdb->node_locks[node->locknum].lock; isc_boolean_t maybe_cleanup = ISC_FALSE; + POST(locktype); + NODE_STRONGLOCK(nodelock); NODE_WEAKLOCK(nodelock, locktype); @@ -1661,6 +1663,7 @@ reactivate_node(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node, */ NODE_WEAKUNLOCK(nodelock, locktype); locktype = isc_rwlocktype_write; + POST(locktype); NODE_WEAKLOCK(nodelock, locktype); if (ISC_LINK_LINKED(node, deadlink)) ISC_LIST_UNLINK(rbtdb->deadnodes[node->locknum],