summaryrefslogtreecommitdiff
path: root/src/conn
diff options
context:
space:
mode:
authorAlex Gorrod <alexg@wiredtiger.com>2015-05-15 05:43:04 +0000
committerMichael Cahill <michael.cahill@mongodb.com>2015-05-26 11:19:15 +1000
commit30e29e6188cf13d136b0d7b9091bd909ec65e818 (patch)
tree730d605d108fe60541ad6b3a6602ecf2282ad970 /src/conn
parent1d080559065fdd6533b81827e7102b8d64a1d584 (diff)
downloadmongo-30e29e6188cf13d136b0d7b9091bd909ec65e818.tar.gz
Cleanup flow in sweep mark dead function.
Fix dereference of NULL dhandle. Conflicts: src/conn/conn_sweep.c
Diffstat (limited to 'src/conn')
-rw-r--r--src/conn/conn_sweep.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/conn/conn_sweep.c b/src/conn/conn_sweep.c
index e5846308c1b..7a5bb6ccb0b 100644
--- a/src/conn/conn_sweep.c
+++ b/src/conn/conn_sweep.c
@@ -118,7 +118,6 @@ __sweep_expire(WT_SESSION_IMPL *session)
WT_DATA_HANDLE *dhandle;
WT_DECL_RET;
time_t now;
- int evict_reset;
conn = S2C(session);
@@ -145,7 +144,6 @@ __sweep_expire(WT_SESSION_IMPL *session)
WT_WITH_DHANDLE(session, dhandle,
ret = __sweep_expire_handle(session));
-
WT_RET_BUSY_OK(ret);
}