Revert "SERVER-39520 Use database IX lock for dropCollection"

This reverts commit 3a8c33cd95abaa7455b2c01726bdbf413cc938e5.

1 files changed, 3 insertions, 2 deletions

diff --git a/src/mongo/db/commands/validate.cpp b/src/mongo/db/commands/validate.cpp
index df8abe7b222..dbc5ff11323 100644
--- a/src/mongo/db/commands/validate.cpp
+++ b/src/mongo/db/commands/validate.cpp
@@ -123,7 +123,7 @@ public:
         }
 
         AutoGetDb ctx(opCtx, nss.db(), MODE_IX);
-        Lock::CollectionLock collLk(opCtx, nss, MODE_X);
+        auto collLk = stdx::make_unique<Lock::CollectionLock>(opCtx, nss, MODE_X);
         Collection* collection = ctx.getDb() ? ctx.getDb()->getCollection(opCtx, nss) : NULL;
         if (!collection) {
             if (ctx.getDb() && ViewCatalog::get(ctx.getDb())->lookup(opCtx, nss.ns())) {
@@ -163,7 +163,8 @@ public:
         const bool background = false;
 
         ValidateResults results;
-        Status status = collection->validate(opCtx, level, background, &results, &result);
+        Status status =
+            collection->validate(opCtx, level, background, std::move(collLk), &results, &result);
         if (!status.isOK()) {
             return CommandHelpers::appendCommandStatusNoThrow(result, status);
         }