lib/nfs/Connection: broadcast error before closing connection

During the NfsLease::OnNfsConnectionFailed() call, the old (defunct) nfs_context may be used to close file handles. Such code does not yet exist, but will be added soon to fix other bugs.

lib/nfs/Connection: broadcast error before closing connection
b293b160 · Max Kellermann · f5f43db2 · b293b160
Commit b293b160 authored Nov 25, 2014 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

Connection.cxx src/lib/nfs/Connection.cxx +4 -4

No files found.
--- a/src/lib/nfs/Connection.cxx
+++ b/src/lib/nfs/Connection.cxx
@@ -409,10 +409,10 @@ NfsConnection::OnSocketReady(unsigned flags)
 		error.Format(nfs_domain, "NFS connection has failed: %s",
 			     nfs_get_error(context));

+		BroadcastError(std::move(error));
+
 		DestroyContext();
 		closed = true;
-
-		BroadcastError(std::move(error));
 	} else if (SocketMonitor::IsDefined() && nfs_get_fd(context) < 0) {
 		/* this happens when rpc_reconnect_requeue() is called
 		   after the connection broke, but autoreconnet was
@@ -425,10 +425,10 @@ NfsConnection::OnSocketReady(unsigned flags)
 			error.Format(nfs_domain,
 				     "NFS socket disappeared: %s", msg);

+		BroadcastError(std::move(error));
+
 		DestroyContext();
 		closed = true;
-
-		BroadcastError(std::move(error));
 	}

 	assert(in_event);