1 files changed, 17 insertions, 17 deletions

diff --git a/src/mongo/db/catalog/collection_cursor_cache.cpp b/src/mongo/db/catalog/collection_cursor_cache.cpp
index d4727a17ee2..926baf7a137 100644
--- a/src/mongo/db/catalog/collection_cursor_cache.cpp
+++ b/src/mongo/db/catalog/collection_cursor_cache.cpp
@@ -98,11 +98,11 @@ namespace mongo {
         /**
          * works globally
          */
-        bool eraseCursor(OperationContext* txn, CursorId id, bool checkAuth);
+        bool eraseCursor( CursorId id, bool checkAuth );
 
         void appendStats( BSONObjBuilder& builder );
 
-        std::size_t timeoutCursors(OperationContext* txn, int millisSinceLastCall);
+        std::size_t timeoutCursors( int millisSinceLastCall );
 
         int64_t nextSeed();
 
@@ -159,7 +159,7 @@ namespace mongo {
         _idToNS.erase( id );
     }
 
-    bool GlobalCursorIdCache::eraseCursor(OperationContext* txn, CursorId id, bool checkAuth) {
+    bool GlobalCursorIdCache::eraseCursor(CursorId id, bool checkAuth) {
         string ns;
         {
             SimpleMutex::scoped_lock lk( _mutex );
@@ -175,8 +175,8 @@ namespace mongo {
 
         if ( checkAuth ) {
             AuthorizationSession* as = cc().getAuthorizationSession();
-            bool isAuthorized = as->isAuthorizedForActionsOnNamespace(
-                                        txn, nss, ActionType::killCursors);
+            bool isAuthorized = as->isAuthorizedForActionsOnNamespace(nss,
+                                                                      ActionType::killCursors);
             if ( !isAuthorized ) {
                 audit::logKillCursorsAuthzCheck( currentClient.get(),
                                                  nss,
@@ -186,8 +186,8 @@ namespace mongo {
             }
         }
 
-        Lock::DBRead lock(txn->lockState(), ns);
-        Database* db = dbHolder().get(ns, storageGlobalParams.dbpath);
+        Lock::DBRead lock( ns );
+        Database* db = dbHolder().get( ns, storageGlobalParams.dbpath );
         if ( !db )
             return false;
         Client::Context context( ns, db );
@@ -204,7 +204,7 @@ namespace mongo {
         return collection->cursorCache()->eraseCursor( id, checkAuth );
     }
 
-    std::size_t GlobalCursorIdCache::timeoutCursors(OperationContext* txn, int millisSinceLastCall) {
+    std::size_t GlobalCursorIdCache::timeoutCursors( int millisSinceLastCall ) {
         vector<string> todo;
         {
             SimpleMutex::scoped_lock lk( _mutex );
@@ -216,7 +216,7 @@ namespace mongo {
 
         for ( unsigned i = 0; i < todo.size(); i++ ) {
             const string& ns = todo[i];
-            Lock::DBRead lock(txn->lockState(), ns);
+            Lock::DBRead lock( ns );
             Database* db = dbHolder().get( ns, storageGlobalParams.dbpath );
             if ( !db )
                 continue;
@@ -235,25 +235,25 @@ namespace mongo {
 
     // ---
 
-    std::size_t CollectionCursorCache::timeoutCursorsGlobal(OperationContext* txn, int millisSinceLastCall) {;
-    return _globalCursorIdCache.timeoutCursors(txn, millisSinceLastCall);
+    std::size_t CollectionCursorCache::timeoutCursorsGlobal( int millisSinceLastCall ) {
+        return _globalCursorIdCache.timeoutCursors( millisSinceLastCall );
     }
 
-    int CollectionCursorCache::eraseCursorGlobalIfAuthorized(OperationContext* txn, int n, long long* ids) {
+    int CollectionCursorCache::eraseCursorGlobalIfAuthorized(int n, long long* ids) {
         int numDeleted = 0;
         for ( int i = 0; i < n; i++ ) {
-            if ( eraseCursorGlobalIfAuthorized(txn, ids[i] ) )
+            if ( eraseCursorGlobalIfAuthorized( ids[i] ) )
                 numDeleted++;
             if ( inShutdown() )
                 break;
         }
         return numDeleted;
     }
-    bool CollectionCursorCache::eraseCursorGlobalIfAuthorized(OperationContext* txn, CursorId id) {
-        return _globalCursorIdCache.eraseCursor(txn, id, true);
+    bool CollectionCursorCache::eraseCursorGlobalIfAuthorized(CursorId id) {
+        return _globalCursorIdCache.eraseCursor( id, true );
     }
-    bool CollectionCursorCache::eraseCursorGlobal(OperationContext* txn, CursorId id) {
-        return _globalCursorIdCache.eraseCursor(txn, id, false );
+    bool CollectionCursorCache::eraseCursorGlobal( CursorId id ) {
+        return _globalCursorIdCache.eraseCursor( id, false );
     }