diff options
| author | Keith Bostic <keith@wiredtiger.com> | 2016-03-01 10:04:28 -0500 |
|---|---|---|
| committer | Keith Bostic <keith@wiredtiger.com> | 2016-03-01 10:04:28 -0500 |
| commit | b96befb2529e870b41d8e2e2edda7788acab463b (patch) | |
| tree | 5105810dc3733a93da8efd817605f5f904334b29 /src/btree/bt_handle.c | |
| parent | 07209b0e327445d022d2df674c31ec75ec3d9d12 (diff) | |
| download | mongo-b96befb2529e870b41d8e2e2edda7788acab463b.tar.gz | |
Revert "WT-2345: __wt_evict_file_exclusive_on/off cleanups"
This reverts commit b4f20f40a25bcc8e51c12923b9660d44236d1eb6.
Diffstat (limited to 'src/btree/bt_handle.c')
| -rw-r--r-- | src/btree/bt_handle.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/btree/bt_handle.c b/src/btree/bt_handle.c index 04f55f61e47..bf888bfa65f 100644 --- a/src/btree/bt_handle.c +++ b/src/btree/bt_handle.c @@ -147,7 +147,6 @@ __wt_btree_close(WT_SESSION_IMPL *session) btree = S2BT(session); - /* Close the block manager. */ if ((bm = btree->bm) != NULL) { /* Unload the checkpoint, unless it's a special command. */ if (!F_ISSET(btree, @@ -163,7 +162,10 @@ __wt_btree_close(WT_SESSION_IMPL *session) /* Close the Huffman tree. */ __wt_btree_huffman_close(session); + /* Destroy locks. */ WT_TRET(__wt_rwlock_destroy(session, &btree->ovfl_lock)); + __wt_spin_destroy(session, &btree->evict_lock); + __wt_spin_destroy(session, &btree->flush_lock); /* Free allocated memory. */ __wt_free(session, btree->key_format); @@ -180,17 +182,6 @@ __wt_btree_close(WT_SESSION_IMPL *session) btree->bulk_load_ok = false; - /* Reset eviction information. */ - __wt_spin_destroy(session, &btree->evict_lock); - btree->evict_ref = NULL; - btree->evict_walk_period = 0; - btree->evict_walk_skips = 0; - btree->evict_disabled = 0; - btree->evict_busy = 0; - F_CLR(btree, WT_BTREE_NO_EVICTION); - - __wt_spin_destroy(session, &btree->flush_lock); - F_CLR(btree, WT_BTREE_SPECIAL_FLAGS); return (ret); |