Merge pull request #459 from ceph/unused-spinlock

log: remove unused lock

Reviewed-by: Sage Weil <sage@inktank.com>

2 files changed, 0 insertions, 5 deletions

diff --git a/src/log/Log.cc b/src/log/Log.cc
index e06afbfe1e2..afeb1208002 100644
--- a/src/log/Log.cc
+++ b/src/log/Log.cc
@@ -42,9 +42,6 @@ Log::Log(SubsystemMap *s)
 {
   int ret;
 
-  ret = pthread_spin_init(&m_lock, PTHREAD_PROCESS_SHARED);
-  assert(ret == 0);
-
   ret = pthread_mutex_init(&m_flush_mutex, NULL);
   assert(ret == 0);
 
@@ -73,7 +70,6 @@ Log::~Log()
   if (m_fd >= 0)
     TEMP_FAILURE_RETRY(::close(m_fd));
 
-  pthread_spin_destroy(&m_lock);
   pthread_mutex_destroy(&m_queue_mutex);
   pthread_mutex_destroy(&m_flush_mutex);
   pthread_cond_destroy(&m_cond_loggers);
diff --git a/src/log/Log.h b/src/log/Log.h
index f6a27dc5b37..b5e16fdde79 100644
--- a/src/log/Log.h
+++ b/src/log/Log.h
@@ -21,7 +21,6 @@ class Log : private Thread
 
   SubsystemMap *m_subs;
   
-  pthread_spinlock_t m_lock;
   pthread_mutex_t m_queue_mutex;
   pthread_mutex_t m_flush_mutex;
   pthread_cond_t m_cond_loggers;