SERVER-13961 Pass LockState to DBWrite and DBRead directly

This is part of the changes to move LockState be part of OperationContext
and not retrieved from TLS.

1 files changed, 6 insertions, 3 deletions

diff --git a/src/mongo/db/index_rebuilder.cpp b/src/mongo/db/index_rebuilder.cpp
index 3e45d143cab..b9c89ab8b04 100644
--- a/src/mongo/db/index_rebuilder.cpp
+++ b/src/mongo/db/index_rebuilder.cpp
@@ -63,7 +63,9 @@ namespace mongo {
             for (std::vector<std::string>::const_iterator dbName = dbNames.begin();
                  dbName < dbNames.end();
                  dbName++) {
-                Client::ReadContext ctx(*dbName);
+                OperationContextImpl txn;
+                Client::ReadContext ctx(&txn, *dbName);
+
                 Database* db = ctx.ctx().db();
                 db->getDatabaseCatalogEntry()->getCollectionNamespaces(&collNames);
             }
@@ -88,10 +90,11 @@ namespace mongo {
 
             LOG(3) << "IndexRebuilder::checkNS: " << ns;
 
+            OperationContextImpl txn;  // XXX???
+
             // This write lock is held throughout the index building process
             // for this namespace.
-            Client::WriteContext ctx(ns);
-            OperationContextImpl txn;  // XXX???
+            Client::WriteContext ctx(&txn, ns);
 
             Collection* collection = ctx.ctx().db()->getCollection( ns );
             if ( collection == NULL )