diff options
| author | Alex Gorrod <alexander.gorrod@mongodb.com> | 2017-06-27 12:01:10 +1000 |
|---|---|---|
| committer | Alex Gorrod <alexander.gorrod@mongodb.com> | 2017-06-27 12:01:10 +1000 |
| commit | 95d911ab246e444192f34dc395652dba2653dd3c (patch) | |
| tree | 8e7c4692125a841a486607ccfe26e8499bc4c398 /src/btree/bt_discard.c | |
| parent | 19cd4d9be2c0fd980c00bb04bc949970002f5cb2 (diff) | |
| parent | d139a5d5be1d7ba94130502b379a61a809e66272 (diff) | |
| download | mongo-95d911ab246e444192f34dc395652dba2653dd3c.tar.gz | |
Merge branch 'mongodb-3.6'2.9.3
Diffstat (limited to 'src/btree/bt_discard.c')
| -rw-r--r-- | src/btree/bt_discard.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/btree/bt_discard.c b/src/btree/bt_discard.c index bab7b8145d6..bfa8eb25aac 100644 --- a/src/btree/bt_discard.c +++ b/src/btree/bt_discard.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2014-2016 MongoDB, Inc. + * Copyright (c) 2014-2017 MongoDB, Inc. * Copyright (c) 2008-2014 WiredTiger, Inc. * All rights reserved. * @@ -98,7 +98,6 @@ __page_out_int(WT_SESSION_IMPL *session, WT_PAGE **pagep, bool rewrite) */ WT_ASSERT(session, !__wt_page_is_modified(page)); WT_ASSERT(session, !F_ISSET_ATOMIC(page, WT_PAGE_EVICT_LRU)); - WT_ASSERT(session, !__wt_rwlock_islocked(session, &page->page_lock)); /* * If a root page split, there may be one or more pages linked from the @@ -254,6 +253,7 @@ __free_page_modify(WT_SESSION_IMPL *session, WT_PAGE *page) __wt_ovfl_discard_free(session, page); __wt_free(session, page->modify->ovfl_track); + __wt_spin_destroy(session, &page->modify->page_lock); __wt_free(session, page->modify); } |