summaryrefslogtreecommitdiff
path: root/src/session/session_dhandle.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/session/session_dhandle.c')
-rw-r--r--src/session/session_dhandle.c21
1 files changed, 11 insertions, 10 deletions
diff --git a/src/session/session_dhandle.c b/src/session/session_dhandle.c
index 732dc797b6d..f1251794b89 100644
--- a/src/session/session_dhandle.c
+++ b/src/session/session_dhandle.c
@@ -181,17 +181,17 @@ __wt_session_lock_dhandle(
*/
if (F_ISSET(dhandle, WT_DHANDLE_OPEN) &&
(!want_exclusive || lock_busy)) {
- __wt_readlock(session, dhandle->rwlock);
+ __wt_readlock(session, &dhandle->rwlock);
if (F_ISSET(dhandle, WT_DHANDLE_DEAD)) {
*is_deadp = 1;
- __wt_readunlock(session, dhandle->rwlock);
+ __wt_readunlock(session, &dhandle->rwlock);
return (0);
}
is_open = F_ISSET(dhandle, WT_DHANDLE_OPEN);
if (is_open && !want_exclusive)
return (0);
- __wt_readunlock(session, dhandle->rwlock);
+ __wt_readunlock(session, &dhandle->rwlock);
} else
is_open = false;
@@ -201,10 +201,11 @@ __wt_session_lock_dhandle(
* with another thread that successfully opens the file, we
* don't want to block waiting to get exclusive access.
*/
- if ((ret = __wt_try_writelock(session, dhandle->rwlock)) == 0) {
+ if ((ret =
+ __wt_try_writelock(session, &dhandle->rwlock)) == 0) {
if (F_ISSET(dhandle, WT_DHANDLE_DEAD)) {
*is_deadp = 1;
- __wt_writeunlock(session, dhandle->rwlock);
+ __wt_writeunlock(session, &dhandle->rwlock);
return (0);
}
@@ -215,7 +216,7 @@ __wt_session_lock_dhandle(
if (F_ISSET(dhandle, WT_DHANDLE_OPEN) &&
!want_exclusive) {
lock_busy = false;
- __wt_writeunlock(session, dhandle->rwlock);
+ __wt_writeunlock(session, &dhandle->rwlock);
continue;
}
@@ -286,9 +287,9 @@ __wt_session_release_btree(WT_SESSION_IMPL *session)
if (locked) {
if (write_locked) {
F_CLR(dhandle, WT_DHANDLE_EXCLUSIVE);
- __wt_writeunlock(session, dhandle->rwlock);
+ __wt_writeunlock(session, &dhandle->rwlock);
} else
- __wt_readunlock(session, dhandle->rwlock);
+ __wt_readunlock(session, &dhandle->rwlock);
}
session->dhandle = NULL;
@@ -509,7 +510,7 @@ __wt_session_get_btree(WT_SESSION_IMPL *session,
dhandle->excl_session = NULL;
dhandle->excl_ref = 0;
F_CLR(dhandle, WT_DHANDLE_EXCLUSIVE);
- __wt_writeunlock(session, dhandle->rwlock);
+ __wt_writeunlock(session, &dhandle->rwlock);
WT_WITH_SCHEMA_LOCK(session,
WT_WITH_HANDLE_LIST_LOCK(session,
@@ -531,7 +532,7 @@ __wt_session_get_btree(WT_SESSION_IMPL *session,
dhandle->excl_session = NULL;
dhandle->excl_ref = 0;
F_CLR(dhandle, WT_DHANDLE_EXCLUSIVE);
- __wt_writeunlock(session, dhandle->rwlock);
+ __wt_writeunlock(session, &dhandle->rwlock);
WT_RET(ret);
}