SERVER-18410: Replace RWLock with OperationContext/LockManager

1 files changed, 10 insertions, 2 deletions

diff --git a/src/mongo/db/storage/mmap_v1/catalog/namespace_index.h b/src/mongo/db/storage/mmap_v1/catalog/namespace_index.h
index 8bcf836518c..51aae08ea61 100644
--- a/src/mongo/db/storage/mmap_v1/catalog/namespace_index.h
+++ b/src/mongo/db/storage/mmap_v1/catalog/namespace_index.h
@@ -51,9 +51,17 @@ class NamespaceIndex {
     MONGO_DISALLOW_COPYING(NamespaceIndex);
 
 public:
-    NamespaceIndex(const std::string& dir, const std::string& database);
+    NamespaceIndex(OperationContext* txn, const std::string& dir, const std::string& database);
     ~NamespaceIndex();
 
+    /**
+     * Must be called before destruction.
+     */
+    void close(OperationContext* txn) {
+        LockMongoFilesExclusive lock(txn);
+        _f.close(txn);
+    }
+
     /* returns true if the file represented by this file exists on disk */
     bool pathExists() const;
 
@@ -86,7 +94,7 @@ private:
     const std::string _dir;
     const std::string _database;
 
-    DurableMappedFile _f{MongoFile::Options::SEQUENTIAL};
+    DurableMappedFile _f;
     std::unique_ptr<NamespaceHashTable> _ht;
 };
 }