diff options
| author | Alex Gorrod <alexg@wiredtiger.com> | 2016-03-22 11:36:58 +1100 |
|---|---|---|
| committer | Alex Gorrod <alexg@wiredtiger.com> | 2016-03-22 11:36:58 +1100 |
| commit | 300d2882c1f3334b75bfec82e08f5a5274668eb3 (patch) | |
| tree | cdf3886fefc89b4acd3ec66532d94554284a08dc | |
| parent | 9121562bebd77b82dd3fe6e467e735864232efe1 (diff) | |
| download | mongo-300d2882c1f3334b75bfec82e08f5a5274668eb3.tar.gz | |
WT-2499 Cleanup LSM tree release
| -rw-r--r-- | src/lsm/lsm_tree.c | 11 |
1 files 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); - } /* |