lib/nfs/Connection: reduce Error instance allocations

990809cc · Max Kellermann · bfcc4666 · 990809cc
Commit 990809cc authored Oct 09, 2014 by Max Kellermann
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

Connection.cxx src/lib/nfs/Connection.cxx +2 -3

No files found.
--- 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));