1 files changed, 15 insertions, 15 deletions

diff --git a/storage/tokudb/tokudb_background.cc b/storage/tokudb/tokudb_background.cc
index e019e41c788..13e0e9321cc 100644
--- a/storage/tokudb/tokudb_background.cc
+++ b/storage/tokudb/tokudb_background.cc
@@ -66,13 +66,13 @@ void job_manager_t::destroy() {
     _sem.set_interrupt();
 
     while (_background_jobs.size()) {
-        _mutex.lock();
+        mutex_t_lock(_mutex);
         job_t* job = _background_jobs.front();
         if (!job->cancelled())
             cancel(job);
         _background_jobs.pop_front();
         delete job;
-        _mutex.unlock();
+        mutex_t_unlock(_mutex);
     }
 
     void* result;
@@ -83,7 +83,7 @@ bool job_manager_t::run_job(job_t* newjob, bool background) {
     bool ret = false;
     const char* jobkey = newjob->key();
 
-    _mutex.lock();
+    mutex_t_lock(_mutex);
     assert_always(!_shutdown);
 
     for (jobs_t::iterator it = _background_jobs.begin();
@@ -138,15 +138,16 @@ bool job_manager_t::run_job(job_t* newjob, bool background) {
     }
 
 cleanup:
-    _mutex.unlock();
+    mutex_t_unlock(_mutex);
     return ret;
 }
 bool job_manager_t::cancel_job(const char* key) {
     bool ret = false;
-    _mutex.lock();
+    mutex_t_lock(_mutex);
 
     for (jobs_t::iterator it = _background_jobs.begin();
-         it != _background_jobs.end(); it++) {
+         it != _background_jobs.end();
+         it++) {
         job_t* job = *it;
 
         if (!job->cancelled() && strcmp(job->key(), key) == 0) {
@@ -155,12 +156,11 @@ bool job_manager_t::cancel_job(const char* key) {
         }
     }
 
-    _mutex.unlock();
+    mutex_t_unlock(_mutex);
     return ret;
 }
 void job_manager_t::iterate_jobs(pfn_iterate_t callback, void* extra) const {
-
-    _mutex.lock();
+    mutex_t_lock(_mutex);
 
     for (jobs_t::const_iterator it = _background_jobs.begin();
          it != _background_jobs.end();
@@ -171,7 +171,7 @@ void job_manager_t::iterate_jobs(pfn_iterate_t callback, void* extra) const {
         }
     }
 
-    _mutex.unlock();
+    mutex_t_unlock(_mutex);
 }
 void* job_manager_t::thread_func(void* v) {
     return ((tokudb::background::job_manager_t*)v)->real_thread_func();
@@ -189,14 +189,14 @@ void* job_manager_t::real_thread_func() {
                 tokudb::time::sleep_microsec(250000);
                 continue;
             }
-#endif // TOKUDB_DEBUG
+#endif  // TOKUDB_DEBUG
 
-            _mutex.lock();
+            mutex_t_lock(_mutex);
             assert_debug(_background_jobs.size() > 0);
             job_t* job = _background_jobs.front();
             run(job);
             _background_jobs.pop_front();
-            _mutex.unlock();
+            mutex_t_unlock(_mutex);
             delete job;
         }
     }
@@ -205,11 +205,11 @@ void* job_manager_t::real_thread_func() {
 void job_manager_t::run(job_t* job) {
     assert_debug(_mutex.is_owned_by_me());
     if (!job->cancelled()) {
-        _mutex.unlock();
+        mutex_t_unlock(_mutex);
         // do job
         job->run();
         // done job
-        _mutex.lock();
+        mutex_t_lock(_mutex);
     }
     if (!job->cancelled()) {
         job->destroy();