From: Jason Dillaman <dillaman@redhat.com>
Date: Thu, 30 Apr 2015 17:38:29 +0000 (-0400)
Subject: log: fix helgrind warnings regarding possible data race
X-Git-Tag: v9.0.2~46^2~14
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c1e14451775049bbd95bcb19a0b62ab5e2c0a7bb;p=ceph.git

log: fix helgrind warnings regarding possible data race

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/src/log/Log.cc b/src/log/Log.cc
index 046774dfce83..a450953e71d6 100644
--- a/src/log/Log.cc
+++ b/src/log/Log.cc
@@ -106,7 +106,11 @@ void Log::set_max_new(int n)
 
 void Log::set_max_recent(int n)
 {
+  pthread_mutex_lock(&m_flush_mutex);
+  m_flush_mutex_holder = pthread_self();
   m_max_recent = n;
+  m_flush_mutex_holder = 0;
+  pthread_mutex_unlock(&m_flush_mutex);
 }
 
 void Log::set_log_file(string fn)