From eca3a5b85b245130fa4ce6ae3c8db9d7365c2fd2 Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Fri, 17 Aug 2018 13:38:32 -0700
Subject: [PATCH] ircd::db: No need for adopt_lock here.

---
 ircd/db.cc | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/ircd/db.cc b/ircd/db.cc
index c23f6e9ac..b333351aa 100644
--- a/ircd/db.cc
+++ b/ircd/db.cc
@@ -3377,12 +3377,7 @@ rocksdb::port::CondVar::Wait()
 	assert(mu);
 	assert_main_thread();
 	mu->AssertHeld();
-	std::unique_lock<decltype(mu->mu)> l
-	{
-		mu->mu, std::adopt_lock
-	};
-
-	cv.wait(l);
+	cv.wait(mu->mu);
 }
 
 // Returns true if timeout occurred
@@ -3401,12 +3396,7 @@ rocksdb::port::CondVar::TimedWait(uint64_t abs_time_us)
 	mu->AssertHeld();
 	const std::chrono::microseconds us(abs_time_us);
 	const std::chrono::steady_clock::time_point tp(us);
-	std::unique_lock<decltype(mu->mu)> l
-	{
-		mu->mu, std::adopt_lock
-	};
-
-	return cv.wait_until(l, tp) == std::cv_status::timeout;
+	return cv.wait_until(mu->mu, tp) == std::cv_status::timeout;
 }
 
 void