diff options
| author | Alex Gorrod <alexander.gorrod@mongodb.com> | 2016-03-22 14:15:33 +1100 |
|---|---|---|
| committer | Alex Gorrod <alexander.gorrod@mongodb.com> | 2016-03-22 14:15:33 +1100 |
| commit | 18e6091d9c16bf46bc8d0750b2227ca71a559c33 (patch) | |
| tree | dd8d22e7b881791e64cd8efaa9d0befb12b2ba84 /src/lsm/lsm_tree.c | |
| parent | 828170f164a2dbb19c824edcd001a340083c8189 (diff) | |
| parent | e3a043eed98859f1585b0854c179c81f7486f1e7 (diff) | |
| download | mongo-18e6091d9c16bf46bc8d0750b2227ca71a559c33.tar.gz | |
Merge pull request #2609 from wiredtiger/wt-2503
WT-2503 Rename "wait" to avoid shadowing system call.
Diffstat (limited to 'src/lsm/lsm_tree.c')
| -rw-r--r-- | src/lsm/lsm_tree.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lsm/lsm_tree.c b/src/lsm/lsm_tree.c index 5ede47c0c43..cb1ddf22f84 100644 --- a/src/lsm/lsm_tree.c +++ b/src/lsm/lsm_tree.c @@ -86,7 +86,7 @@ __lsm_tree_discard(WT_SESSION_IMPL *session, WT_LSM_TREE *lsm_tree, bool final) * Close an LSM tree structure. */ static int -__lsm_tree_close(WT_SESSION_IMPL *session, WT_LSM_TREE *lsm_tree, bool wait) +__lsm_tree_close(WT_SESSION_IMPL *session, WT_LSM_TREE *lsm_tree, bool final) { WT_DECL_RET; int i; @@ -106,7 +106,7 @@ __lsm_tree_close(WT_SESSION_IMPL *session, WT_LSM_TREE *lsm_tree, bool wait) * access is not available. */ for (i = 0; - lsm_tree->queue_ref > 0 || (wait && lsm_tree->refcnt > 1); ++i) { + lsm_tree->queue_ref > 0 || (final && lsm_tree->refcnt > 1); ++i) { /* * Remove any work units from the manager queues. Do this step * repeatedly in case a work unit was in the process of being |