From: Sage Weil <sage@redhat.com>
Date: Fri, 19 Oct 2018 13:31:29 +0000 (-0500)
Subject: Merge PR #24623 into master
X-Git-Tag: v14.1.0~1146
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a9b4ed6c016cb8b8a6f0fa9ff237818e1afeb24e;p=ceph.git

Merge PR #24623 into master

* refs/pull/24623/head:
	mgr: Mutex::Locker -> std::lock_guard
	kv: Mutex::Locker -> std::lock_guard
	librados: Mutex::Locker -> std::lock_guard
	mon: Mutex::Locker -> std::lock_guard
	osd: Mutex::Locker -> std::lock_guard

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
---

a9b4ed6c016cb8b8a6f0fa9ff237818e1afeb24e
diff --cc src/osd/OSD.cc
index 0c275e93f911,737545dd18f8..9646e103902c
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@@ -1702,15 -1703,11 +1702,15 @@@ void OSDService::set_ready_to_merge_sou
    _send_ready_to_merge();
  }
  
 -void OSDService::set_ready_to_merge_target(PG *pg, epoch_t last_epoch_clean)
 +void OSDService::set_ready_to_merge_target(PG *pg,
 +					   epoch_t last_epoch_started,
 +					   epoch_t last_epoch_clean)
  {
-   Mutex::Locker l(merge_lock);
+   std::lock_guard l(merge_lock);
    dout(10) << __func__ << " " << pg->pg_id << dendl;
 -  ready_to_merge_target.insert(make_pair(pg->pg_id.pgid, last_epoch_clean));
 +  ready_to_merge_target.insert(make_pair(pg->pg_id.pgid,
 +					 make_pair(last_epoch_started,
 +						   last_epoch_clean)));
    assert(not_ready_to_merge_target.count(pg->pg_id.pgid) == 0);
    _send_ready_to_merge();
  }