]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #24528 into master
authorSage Weil <sage@redhat.com>
Tue, 16 Oct 2018 22:55:59 +0000 (17:55 -0500)
committerSage Weil <sage@redhat.com>
Tue, 16 Oct 2018 22:55:59 +0000 (17:55 -0500)
* refs/pull/24528/head:
common/condition_variable_debug: fix wait hooks
common/mutex_debug: remove no-op before/after hooks
common/mutex_debug: do lockdep post-lock step in caller
os/bluestore: {Mutex,Cond} -> ceph::{mutex,condition_variable}
os/bluestore: std::recursive_mutex -> ceph::recursive_mutex
os/bluestore: re-add is_locked assert
os/bluestore: std::{mutex,condition_variable} -> ceph::{mutex,condition_variable}
os/bluestore: use deduction for lock_guard<>, unique_lock<>

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Adam Kupczyk <akucpzyk@redhat.com>

Trivial merge