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>

diff --cc src/mgr/Mgr.cc
Simple merge

diff --cc src/mon/Monitor.cc
Simple merge

diff --cc src/mon/OSDMonitor.cc
Simple merge

diff --cc src/osd/OSD.cc
index 0c275e93f911730a600faae553baa99ae337b723,737545dd18f80aba3dcec0f784c01a393660427f..9646e103902cb7fe70905f5d2519622d4d85c0f1
--- 1/src/osd/OSD.cc
--- 2/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();
  }

diff --cc src/osd/OSD.h
Simple merge

diff --cc src/osd/PG.cc
Simple merge

diff --cc src/osd/PG.h
Simple merge