From: Jason Dillaman <dillaman@redhat.com>
Date: Thu, 14 Jan 2016 21:21:05 +0000 (-0500)
Subject: Merge remote-tracking branch 'upstream/jewel'
X-Git-Tag: v10.0.3~46
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a290d34ebdfa571f62e69839ae0c3a9d11f075d1;p=ceph.git

Merge remote-tracking branch 'upstream/jewel'
---

a290d34ebdfa571f62e69839ae0c3a9d11f075d1
diff --cc src/osdc/Objecter.cc
index a8fa1e856305,9d6df99093a0..63d89f553ff9
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@@ -2001,10 -1924,9 +2002,10 @@@ void Objecter::tick(
  
    unsigned laggy_ops = 0;
  
 -  for (map<int,OSDSession*>::iterator siter = osd_sessions.begin(); siter != osd_sessions.end(); ++siter) {
 +  for (map<int,OSDSession*>::iterator siter = osd_sessions.begin();
 +       siter != osd_sessions.end(); ++siter) {
      OSDSession *s = siter->second;
-     RWLock::RLocker l(s->lock);
+     RWLock::WLocker l(s->lock);
      bool found = false;
      for (map<ceph_tid_t,Op*>::iterator p = s->ops.begin();
  	p != s->ops.end();