lib/nfs/FileReader: update "state" in OnNfsError()

Clean up the "state" to indicate that there is no longer any asynchronous operation. Fixes another NFS-related crash due to cleanup of a non-existing asynchronous operation.

lib/nfs/FileReader: update "state" in OnNfsError()
40dd968f · Max Kellermann · 3cef348f · 40dd968f
Commit 40dd968f authored Nov 25, 2014 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 24 additions and 0 deletions

FileReader.cxx src/lib/nfs/FileReader.cxx +24 -0

No files found.
--- a/src/lib/nfs/FileReader.cxx
+++ b/src/lib/nfs/FileReader.cxx
@@ -246,6 +246,30 @@ NfsFileReader::OnNfsCallback(unsigned status, void *data)
 void
 NfsFileReader::OnNfsError(Error &&error)
 {
+	switch (state) {
+	case State::INITIAL:
+	case State::DEFER:
+	case State::MOUNT:
+	case State::IDLE:
+		assert(false);
+		gcc_unreachable();
+
+	case State::OPEN:
+		connection->RemoveLease(*this);
+		state = State::INITIAL;
+		break;
+
+	case State::STAT:
+		connection->RemoveLease(*this);
+		connection->Close(fh);
+		state = State::INITIAL;
+		break;
+
+	case State::READ:
+		state = State::IDLE;
+		break;
+	}
+
 	OnNfsFileError(std::move(error));
 }