diff options
| author | Alex Gorrod <alexg@wiredtiger.com> | 2016-03-22 14:49:51 +1100 |
|---|---|---|
| committer | Alex Gorrod <alexg@wiredtiger.com> | 2016-03-22 14:49:51 +1100 |
| commit | 9cf8eb2f15c6df7da90c19c86ccf7516ed126183 (patch) | |
| tree | dd8d22e7b881791e64cd8efaa9d0befb12b2ba84 /src/evict/evict_file.c | |
| parent | 444981a456059f0652fd3bb1968d58d2c37b9089 (diff) | |
| parent | 18e6091d9c16bf46bc8d0750b2227ca71a559c33 (diff) | |
| download | mongodb-3.3.4.tar.gz | |
Merge branch 'develop' into mongodb-3.4mongodb-3.3.4
Diffstat (limited to 'src/evict/evict_file.c')
| -rw-r--r-- | src/evict/evict_file.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/evict/evict_file.c b/src/evict/evict_file.c index 641864a8baa..ca98b1bd62a 100644 --- a/src/evict/evict_file.c +++ b/src/evict/evict_file.c @@ -18,13 +18,12 @@ __wt_evict_file(WT_SESSION_IMPL *session, WT_CACHE_OP syncop) WT_DECL_RET; WT_PAGE *page; WT_REF *next_ref, *ref; - bool evict_reset; /* * We need exclusive access to the file -- disable ordinary eviction * and drain any blocks already queued. */ - WT_RET(__wt_evict_file_exclusive_on(session, &evict_reset)); + WT_RET(__wt_evict_file_exclusive_on(session)); /* Make sure the oldest transaction ID is up-to-date. */ __wt_txn_update_oldest(session, true); @@ -98,8 +97,7 @@ err: /* On error, clear any left-over tree walk. */ session, next_ref, WT_READ_NO_EVICT)); } - if (evict_reset) - __wt_evict_file_exclusive_off(session); + __wt_evict_file_exclusive_off(session); return (ret); } |