From: Jason Dillaman <dillaman@redhat.com>
Date: Mon, 10 Nov 2014 21:08:05 +0000 (-0500)
Subject: common/Readahead: use correct lock when waiting on the pending ops
X-Git-Tag: v0.89~27^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=27049148c7045335a88c2da58343a7dc51ab3174;p=ceph.git

common/Readahead: use correct lock when waiting on the pending ops

Readahead was using the incorrect lock with the pending condition,
resulting in a failed assertion.  It now uses the lock associated
with pending ops.

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

diff --git a/src/common/Readahead.cc b/src/common/Readahead.cc
index fb53e5e9bac0c..a3f5bfc7e4e74 100644
--- a/src/common/Readahead.cc
+++ b/src/common/Readahead.cc
@@ -131,7 +131,7 @@ void Readahead::dec_pending(int count) {
 void Readahead::wait_for_pending() {
   m_pending_lock.Lock();
   while (m_pending > 0) {
-    m_pending_cond.Wait(m_lock);
+    m_pending_cond.Wait(m_pending_lock);
   }
   m_pending_lock.Unlock();
 }