From: Sage Weil <sage@redhat.com>
Date: Sat, 30 Jan 2016 14:28:54 +0000 (-0500)
Subject: os/filestore/CollectionIndex: disable lockdep on access_lock
X-Git-Tag: v10.0.4~82^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=08df77a271154f045948773302f158326d5a574f;p=ceph.git

os/filestore/CollectionIndex: disable lockdep on access_lock

This overflows the lockdep table when there are too many PGs. This
code is static so I'm not worried about new locking bugs.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/os/filestore/CollectionIndex.h b/src/os/filestore/CollectionIndex.h
index 63744cbd08de..a03b09e4b381 100644
--- a/src/os/filestore/CollectionIndex.h
+++ b/src/os/filestore/CollectionIndex.h
@@ -73,7 +73,6 @@ protected:
   };
  public:
 
-  string access_lock_name;
   RWLock access_lock;
   /// Type of returned paths
   typedef ceph::shared_ptr<Path> IndexedPath;
@@ -177,8 +176,7 @@ protected:
   virtual int prep_delete() { return 0; }
 
   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.