From: Sage Weil <sage@redhat.com>
Date: Tue, 6 Oct 2015 19:10:02 +0000 (-0400)
Subject: msg: make last_keepalive[_ack] lock safe
X-Git-Tag: v10.0.1~26^2~32
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=536c70281a8952358e8d88a6ff8d7cd9b8db5a76;p=ceph.git

msg: make last_keepalive[_ack] lock safe

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/msg/Connection.h b/src/msg/Connection.h
index d54b7d6e7eff..2362895e256b 100644
--- a/src/msg/Connection.h
+++ b/src/msg/Connection.h
@@ -39,7 +39,7 @@ class Message;
 class Messenger;
 
 struct Connection : public RefCountedObject {
-  Mutex lock;
+  mutable Mutex lock;
   Messenger *msgr;
   RefCountedObject *priv;
   int peer_type;
@@ -179,15 +179,19 @@ public:
   }
 
   utime_t get_last_keepalive() const {
+    Mutex::Locker l(lock);
     return last_keepalive;
   }
   void set_last_keepalive(utime_t t) {
+    Mutex::Locker l(lock);
     last_keepalive = t;
   }
   utime_t get_last_keepalive_ack() const {
+    Mutex::Locker l(lock);
     return last_keepalive_ack;
   }
   void set_last_keepalive_ack(utime_t t) {
+    Mutex::Locker l(lock);
     last_keepalive_ack = t;
   }