From 990809cc2137b0de968394a0fb6ecde3bd3a0c21 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Thu, 9 Oct 2014 08:08:17 +0200
Subject: lib/nfs/Connection: reduce Error instance allocations

---
 src/lib/nfs/Connection.cxx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/lib/nfs/Connection.cxx')

diff --git a/src/lib/nfs/Connection.cxx b/src/lib/nfs/Connection.cxx
index 012e4daa2..c2c7ceb2b 100644
--- a/src/lib/nfs/Connection.cxx
+++ b/src/lib/nfs/Connection.cxx
@@ -464,8 +464,7 @@ NfsConnection::MountCallback(int status, nfs_context *nfs, void *data,
 inline bool
 NfsConnection::MountInternal(Error &error)
 {
-	if (context != nullptr)
-		return true;
+	assert(context == nullptr);
 
 	context = nfs_init_context();
 	if (context == nullptr) {
@@ -535,7 +534,7 @@ NfsConnection::BroadcastError(Error &&error)
 void
 NfsConnection::RunDeferred()
 {
-	{
+	if (context == nullptr) {
 		Error error;
 		if (!MountInternal(error)) {
 			BroadcastMountError(std::move(error));
-- 
cgit v1.2.3