From fa9278c892a6833694983191a5726b20f6a187a0 Mon Sep 17 00:00:00 2001
From: Charlie Swanson <charlie.swanson@mongodb.com>
Date: Mon, 30 Apr 2018 12:54:34 -0400
Subject: SERVER-33959 Avoid deadlock during global cursor registration

---
 src/mongo/db/cursor_manager.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/mongo/db/cursor_manager.h')

diff --git a/src/mongo/db/cursor_manager.h b/src/mongo/db/cursor_manager.h
index 2104a558bae..6817455ec0d 100644
--- a/src/mongo/db/cursor_manager.h
+++ b/src/mongo/db/cursor_manager.h
@@ -292,8 +292,13 @@ private:
         OperationContext* opCtx, std::unique_ptr<ClientCursor, ClientCursor::Deleter> clientCursor);
 
     void deregisterCursor(ClientCursor* cursor);
+    void deregisterAndDestroyCursor(
+        Partitioned<stdx::unordered_map<CursorId, ClientCursor*>, kNumPartitions>::OnePartition&&,
+        OperationContext* opCtx,
+        std::unique_ptr<ClientCursor, ClientCursor::Deleter> cursor);
 
-    void unpin(OperationContext* opCtx, ClientCursor* cursor);
+    void unpin(OperationContext* opCtx,
+               std::unique_ptr<ClientCursor, ClientCursor::Deleter> cursor);
 
     bool cursorShouldTimeout_inlock(const ClientCursor* cursor, Date_t now);
 
-- 
cgit v1.2.1