From 016063c810281bd05c792dfe8643cc68b4c3cab2 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Tue, 25 Nov 2014 14:00:32 +0100
Subject: lib/nfs/FileReader: move code to CancelOrClose()

---
 src/lib/nfs/FileReader.cxx | 10 ++++++++++
 src/lib/nfs/FileReader.hxx |  6 ++++++
 2 files changed, 16 insertions(+)

(limited to 'src/lib/nfs')

diff --git a/src/lib/nfs/FileReader.cxx b/src/lib/nfs/FileReader.cxx
index 79256492b..455165bbd 100644
--- a/src/lib/nfs/FileReader.cxx
+++ b/src/lib/nfs/FileReader.cxx
@@ -56,8 +56,18 @@ NfsFileReader::Close()
 		return;
 	}
 
+	/* this cancels State::MOUNT */
 	connection->RemoveLease(*this);
 
+	CancelOrClose();
+}
+
+void
+NfsFileReader::CancelOrClose()
+{
+	assert(state != State::INITIAL &&
+	       state != State::DEFER);
+
 	if (state == State::IDLE)
 		/* no async operation in progress: can close
 		   immediately */
diff --git a/src/lib/nfs/FileReader.hxx b/src/lib/nfs/FileReader.hxx
index 424ff766d..1495a2832 100644
--- a/src/lib/nfs/FileReader.hxx
+++ b/src/lib/nfs/FileReader.hxx
@@ -76,6 +76,12 @@ protected:
 	virtual void OnNfsFileError(Error &&error) = 0;
 
 private:
+	/**
+	 * Cancel the current operation, if any.  The NfsLease must be
+	 * unregistered already.
+	 */
+	void CancelOrClose();
+
 	void OpenCallback(nfsfh *_fh);
 	void StatCallback(const struct stat *st);
 
-- 
cgit v1.2.3