From 8bc2783d2e6e39c0910455b4eac9e0f93a482cfc Mon Sep 17 00:00:00 2001
From: Kaloian Manassiev <kaloian.manassiev@mongodb.com>
Date: Wed, 28 May 2014 18:40:59 -0400
Subject: Revert "SERVER-13961 Pass LockState to DBWrite and DBRead directly"

This reverts commit 0672061deb58aac931912bed68d014247c581968.
---
 src/mongo/db/auth/auth_index_d.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/mongo/db/auth/auth_index_d.cpp')

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;
-- 
cgit v1.2.1