diff options
| author | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2014-05-28 18:40:59 -0400 |
|---|---|---|
| committer | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2014-05-28 18:40:59 -0400 |
| commit | 8bc2783d2e6e39c0910455b4eac9e0f93a482cfc (patch) | |
| tree | 46a523ea698d1a9a80013816d8e568e2fdd2f2dc /src/mongo/db/pipeline/document_source_cursor.cpp | |
| parent | 0672061deb58aac931912bed68d014247c581968 (diff) | |
| download | mongo-8bc2783d2e6e39c0910455b4eac9e0f93a482cfc.tar.gz | |
Revert "SERVER-13961 Pass LockState to DBWrite and DBRead directly"
This reverts commit 0672061deb58aac931912bed68d014247c581968.
Diffstat (limited to 'src/mongo/db/pipeline/document_source_cursor.cpp')
| -rw-r--r-- | src/mongo/db/pipeline/document_source_cursor.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mongo/db/pipeline/document_source_cursor.cpp b/src/mongo/db/pipeline/document_source_cursor.cpp index 70ac51d2000..87131cbc17b 100644 --- a/src/mongo/db/pipeline/document_source_cursor.cpp +++ b/src/mongo/db/pipeline/document_source_cursor.cpp @@ -78,7 +78,7 @@ namespace mongo { // We have already validated the sharding version when we constructed the Runner // so we shouldn't check it again. - Lock::DBRead lk(pExpCtx->opCtx->lockState(), _ns); + Lock::DBRead lk(_ns); Client::Context ctx(_ns, storageGlobalParams.dbpath, /*doVersion=*/false); _runner->restoreState(pExpCtx->opCtx); @@ -199,7 +199,7 @@ namespace { Status explainStatus(ErrorCodes::InternalError, ""); scoped_ptr<TypeExplain> plan; { - Lock::DBRead lk(pExpCtx->opCtx->lockState(), _ns); + Lock::DBRead lk(_ns); Client::Context ctx(_ns, storageGlobalParams.dbpath, /*doVersion=*/false); massert(17392, "No _runner. Were we disposed before explained?", _runner); |