From: Josh Durgin <josh.durgin@inktank.com>
Date: Wed, 9 Apr 2014 20:13:04 +0000 (-0700)
Subject: RWLock: don't assign the lockdep id more than once
X-Git-Tag: v0.80-rc1~70^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=957ac3cbe394473f225ffd2b632461fcdaca99e6;p=ceph.git

RWLock: don't assign the lockdep id more than once

This never does anything since lockdep_register() assigns an id >= 0
in the RWLock constructor. This also prevents methods from being
declared const.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
---

diff --git a/src/common/RWLock.h b/src/common/RWLock.h
index 6fabc8c3083a..b3f7cb03cb28 100644
--- a/src/common/RWLock.h
+++ b/src/common/RWLock.h
@@ -41,19 +41,19 @@ public:
   }
 
   void unlock() {
-    if (g_lockdep) id = lockdep_will_unlock(name, id);
+    if (g_lockdep) lockdep_will_unlock(name, id);
     pthread_rwlock_unlock(&L);
   }
 
   // read
   void get_read() {
-    if (g_lockdep) id = lockdep_will_lock(name, id);
+    if (g_lockdep) lockdep_will_lock(name, id);
     pthread_rwlock_rdlock(&L);
-    if (g_lockdep) id = lockdep_locked(name, id);
+    if (g_lockdep) lockdep_locked(name, id);
   }
   bool try_get_read() {
     if (pthread_rwlock_tryrdlock(&L) == 0) {
-      if (g_lockdep) id = lockdep_locked(name, id);
+      if (g_lockdep) lockdep_locked(name, id);
       return true;
     }
     return false;
@@ -64,13 +64,13 @@ public:
 
   // write
   void get_write() {
-    if (g_lockdep) id = lockdep_will_lock(name, id);
+    if (g_lockdep) lockdep_will_lock(name, id);
     pthread_rwlock_wrlock(&L);
-    if (g_lockdep) id = lockdep_locked(name, id);
+    if (g_lockdep) lockdep_locked(name, id);
   }
   bool try_get_write() {
     if (pthread_rwlock_trywrlock(&L) == 0) {
-      if (g_lockdep) id = lockdep_locked(name, id);
+      if (g_lockdep) lockdep_locked(name, id);
       return true;
     }
     return false;