From: Mykola Golub <mgolub@mirantis.com>
Date: Tue, 28 Mar 2017 13:55:11 +0000 (+0200)
Subject: kraken: librbd: possible race in ExclusiveLock handle_peer_notification
X-Git-Tag: v11.2.1~209^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=df59d6d5f7deb586cf14a6ef6984e6847db08852;p=ceph.git

kraken: librbd: possible race in ExclusiveLock handle_peer_notification

This is a direct commit to kraken -- the master diverged after
ManagedLock refactoring and is not affected.

Fix: http://tracker.ceph.com/issues/19368
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
---

diff --git a/src/librbd/ExclusiveLock.cc b/src/librbd/ExclusiveLock.cc
index b8d740a9490..a268f20b87f 100644
--- a/src/librbd/ExclusiveLock.cc
+++ b/src/librbd/ExclusiveLock.cc
@@ -242,6 +242,7 @@ void ExclusiveLock<I>::handle_peer_notification(int r) {
 
     ldout(m_image_ctx.cct, 10) << this << " " << __func__ << dendl;
     assert(get_active_action() == ACTION_REQUEST_LOCK);
+    m_state = STATE_ACQUIRING;
 
     if (r >= 0) {
       execute_next_action();