Merge remote-tracking branch 'me/wip-lockdep'

diff --cc src/common/RWLock.h
Simple merge

diff --cc src/os/bluestore/BlueStore.cc
Simple merge

diff --cc src/os/filestore/CollectionIndex.h
index 3c27fecad2080d0d69c77805204086a794c4ee7e,a03b09e4b38184f33c19d82269c62de4208f9124..0d1fc30fcb36c4a8c84cdb5d5b9f151c8b86908a
--- 1/src/os/filestore/CollectionIndex.h
--- 2/src/os/filestore/CollectionIndex.h
+++ b/src/os/filestore/CollectionIndex.h
@@@ -176,9 -175,8 +175,8 @@@ protected
    /// Call prior to removing directory
    virtual int prep_delete() { return 0; }
  
 -  CollectionIndex(const coll_t& collection):
 +  explicit CollectionIndex(const coll_t& collection):
-     access_lock_name ("CollectionIndex::access_lock::" + collection.to_str()),
-     access_lock(access_lock_name.c_str()) {}
+     access_lock("CollectionIndex::access_lock", true, false) {}
  
    /*
     * Pre-hash the collection, this collection should map to a PG folder.

diff --cc src/os/memstore/MemStore.h
index f6a521441eee74530de2a0945f5d9eb7ed4aa73b,fe588ab4abb6080f9df622332efbd8ec8b99ce15..df37d88165218ce6d6c48518fc311055e6ae8855
--- 1/src/os/memstore/MemStore.h
--- 2/src/os/memstore/MemStore.h
+++ b/src/os/memstore/MemStore.h
@@@ -243,9 -243,10 +243,10 @@@ public
        return result;
      }
  
 -    Collection(CephContext *cct)
 +    explicit Collection(CephContext *cct)
        : cct(cct), use_page_set(cct->_conf->memstore_page_set),
-         lock("MemStore::Collection::lock"), exists(true) {}
+         lock("MemStore::Collection::lock", true, false),
+       exists(true) {}
    };
    typedef Collection::Ref CollectionRef;