diff options
| author | Michael Cahill <michael.cahill@mongodb.com> | 2015-04-30 16:44:07 +1000 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@mongodb.com> | 2015-04-30 16:44:07 +1000 |
| commit | be25c67146cedf2e308e2098aa5f259abbdcae80 (patch) | |
| tree | 297f9345be82eba3742c510096d69f46d65118da /src/schema/schema_worker.c | |
| parent | 04a8b8446341b83c1e17996b5fa3979b7d4f518f (diff) | |
| download | mongo-be25c67146cedf2e308e2098aa5f259abbdcae80.tar.gz | |
Rename the locking macros: use "handle list" lock consistently, make the session locking flags sort together. Create a macro for acquiring the checkpoint lock to execute an operation, use it to clean up some repeated boilerplate.
Diffstat (limited to 'src/schema/schema_worker.c')
| -rw-r--r-- | src/schema/schema_worker.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/schema/schema_worker.c b/src/schema/schema_worker.c index 701c3003e5f..76b47a2ccff 100644 --- a/src/schema/schema_worker.c +++ b/src/schema/schema_worker.c @@ -49,7 +49,7 @@ __wt_schema_worker(WT_SESSION_IMPL *session, * any open file handles, including checkpoints. */ if (FLD_ISSET(open_flags, WT_DHANDLE_EXCLUSIVE)) { - WT_WITH_DHANDLE_LOCK(session, + WT_WITH_HANDLE_LIST_LOCK(session, ret = __wt_conn_dhandle_close_all( session, uri, 0)); WT_ERR(ret); @@ -63,7 +63,7 @@ __wt_schema_worker(WT_SESSION_IMPL *session, } else if (ret == EBUSY) { WT_ASSERT(session, !FLD_ISSET( open_flags, WT_DHANDLE_EXCLUSIVE)); - WT_WITH_DHANDLE_LOCK(session, + WT_WITH_HANDLE_LIST_LOCK(session, ret = __wt_conn_btree_apply_single_ckpt( session, uri, file_func, cfg)); } |