From 300d2882c1f3334b75bfec82e08f5a5274668eb3 Mon Sep 17 00:00:00 2001 From: Alex Gorrod Date: Tue, 22 Mar 2016 11:36:58 +1100 Subject: WT-2499 Cleanup LSM tree release --- src/lsm/lsm_tree.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/lsm/lsm_tree.c b/src/lsm/lsm_tree.c index fc3126a3823..2b7e68b3f4e 100644 --- a/src/lsm/lsm_tree.c +++ b/src/lsm/lsm_tree.c @@ -392,10 +392,8 @@ __lsm_tree_find(WT_SESSION_IMPL *session, if (__lsm_tree_close( session, lsm_tree, false) != 0 || lsm_tree->refcnt != 1) { - (void)__wt_atomic_sub32( - &lsm_tree->refcnt, 1); - lsm_tree->active = true; - lsm_tree->excl_session = NULL; + __wt_lsm_tree_release( + session, lsm_tree); return (EBUSY); } } else { @@ -408,8 +406,8 @@ __lsm_tree_find(WT_SESSION_IMPL *session, if (lsm_tree->excl_session != NULL) { WT_ASSERT(session, lsm_tree->refcnt > 0); - (void)__wt_atomic_sub32( - &lsm_tree->refcnt, 1); + __wt_lsm_tree_release( + session, lsm_tree); return (EBUSY); } } @@ -1307,7 +1305,6 @@ err: __wt_lsm_tree_release(session, lsm_tree); return (ret); - } /* -- cgit v1.2.1