Revert "SERVER-13961 Pass LockState to DBWrite and DBRead directly"

This reverts commit 0672061deb58aac931912bed68d014247c581968.

1 files changed, 3 insertions, 4 deletions

diff --git a/src/mongo/db/auth/auth_index_d.cpp b/src/mongo/db/auth/auth_index_d.cpp
index b8ed201226e..2b510698b60 100644
--- a/src/mongo/db/auth/auth_index_d.cpp
+++ b/src/mongo/db/auth/auth_index_d.cpp
@@ -72,10 +72,9 @@ namespace {
 
 }  // namespace
 
-    void configureSystemIndexes(OperationContext* txn, const StringData& dbname) {
+    void configureSystemIndexes(const StringData& dbname) {
         int authzVersion;
-        Status status = getGlobalAuthorizationManager()->getAuthorizationVersion(
-                                                                txn, &authzVersion);
+        Status status = getGlobalAuthorizationManager()->getAuthorizationVersion(&authzVersion);
         if (!status.isOK()) {
             return;
         }
@@ -84,8 +83,8 @@ namespace {
             NamespaceString systemUsers(dbname, "system.users");
 
             // Make sure the old unique index from v2.4 on system.users doesn't exist.
+            Client::WriteContext wctx(systemUsers);
             OperationContextImpl txn;
-            Client::WriteContext wctx(&txn, systemUsers);
             Collection* collection = wctx.ctx().db()->getCollection(NamespaceString(systemUsers));
             if (!collection) {
                 return;