From: Sage Weil <sage@redhat.com>
Date: Tue, 2 Feb 2016 16:00:37 +0000 (-0500)
Subject: Merge remote-tracking branch 'me/wip-lockdep'
X-Git-Tag: v10.0.4~82
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dc50f310795bb23f3a78b5142d6a9f1e0f3ecb68;p=ceph.git

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

dc50f310795bb23f3a78b5142d6a9f1e0f3ecb68
diff --cc src/os/filestore/CollectionIndex.h
index 3c27fecad208,a03b09e4b381..0d1fc30fcb36
--- a/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 f6a521441eee,fe588ab4abb6..df37d8816521
--- a/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;