Reapply "SERVER-18277 Clarify locking of Client when accessing its stored OperationContext."

This reverts commit 993fc5e4ed9264965f16a948d3732d3fc55d1255.

1 files changed, 1 insertions, 5 deletions

diff --git a/src/mongo/db/curop.cpp b/src/mongo/db/curop.cpp
index 57b3d780d11..640c82063e0 100644
--- a/src/mongo/db/curop.cpp
+++ b/src/mongo/db/curop.cpp
@@ -147,11 +147,7 @@ namespace mongo {
     CurOp* CurOp::get(const OperationContext* opCtx) { return get(*opCtx); }
 
     CurOp* CurOp::get(const OperationContext& opCtx) {
-        return getFromClient(opCtx.getClient());
-    }
-
-    CurOp* CurOp::getFromClient(const Client* client) {
-        return _curopStack(client).top();
+        return _curopStack(opCtx.getClient()).top();
     }
 
     CurOp::CurOp(Client* client) : CurOp(client, &_curopStack(client)) {}