Revert "SERVER-14668: Replace uses of DBWrite lock with DBLock"

This reverts commit da599844c97ef6d290c03e073a9bafe41c1a914e.

Conflicts:
	src/mongo/db/repl/repl_coordinator_external_state_impl.cpp
	src/mongo/dbtests/counttests.cpp
	src/mongo/dbtests/querytests.cpp

1 files changed, 4 insertions, 5 deletions

diff --git a/src/mongo/dbtests/counttests.cpp b/src/mongo/dbtests/counttests.cpp
index b643c30b9c5..31dabc13a97 100644
--- a/src/mongo/dbtests/counttests.cpp
+++ b/src/mongo/dbtests/counttests.cpp
@@ -43,10 +43,9 @@ namespace CountTests {
 
     class Base {
     public:
-        Base() : _lk(_txn.lockState(), nsToDatabaseSubstring(ns()), newlm::MODE_X),
-                 _context(&_txn, ns()),
-                 _client(&_txn) {
-
+        Base() : lk(_txn.lockState(), ns()),
+                     _context(&_txn, ns()),
+                     _client(&_txn) {
             _database = _context.db();
             {
                 WriteUnitOfWork wunit(&_txn);
@@ -105,7 +104,7 @@ namespace CountTests {
 
 
         OperationContextImpl _txn;
-        Lock::DBLock _lk;
+        Lock::DBWrite lk;
 
         Client::Context _context;