From 029555d1921e651f1ed6929561a52eb598def3fb Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 25 Nov 2014 13:10:16 +0100 Subject: lib/nfs/FileReader: include Compiler.h for "final" fallback --- src/lib/nfs/FileReader.hxx | 1 + 1 file changed, 1 insertion(+) (limited to 'src/lib/nfs/FileReader.hxx') diff --git a/src/lib/nfs/FileReader.hxx b/src/lib/nfs/FileReader.hxx index 7f43e0ecf..424ff766d 100644 --- a/src/lib/nfs/FileReader.hxx +++ b/src/lib/nfs/FileReader.hxx @@ -24,6 +24,7 @@ #include "Lease.hxx" #include "Callback.hxx" #include "event/DeferredMonitor.hxx" +#include "Compiler.h" #include -- cgit v1.2.3 From 016063c810281bd05c792dfe8643cc68b4c3cab2 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 25 Nov 2014 14:00:32 +0100 Subject: lib/nfs/FileReader: move code to CancelOrClose() --- src/lib/nfs/FileReader.hxx | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/lib/nfs/FileReader.hxx') 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