oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

lib/nfs/FileReader: move code to CancelOrClose()

Browse Source
This commit is contained in:
Max Kellermann 2014-11-25 14:00:32 +01:00
parent 38f19981b2
commit 016063c810
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/lib/nfs/FileReader.cxx
View File

@ -56,8 +56,18 @@ NfsFileReader::Close()
return; return;
} }
/* this cancels State::MOUNT */
connection->RemoveLease(*this); connection->RemoveLease(*this);
CancelOrClose();
}
void
NfsFileReader::CancelOrClose()
{
assert(state != State::INITIAL &&
state != State::DEFER);
if (state == State::IDLE) if (state == State::IDLE)
/* no async operation in progress: can close /* no async operation in progress: can close
immediately */ immediately */

6
src/lib/nfs/FileReader.hxx
View File

@ -76,6 +76,12 @@ protected:
virtual void OnNfsFileError(Error &&error) = 0; virtual void OnNfsFileError(Error &&error) = 0;
private: private:
/**
* Cancel the current operation, if any. The NfsLease must be
* unregistered already.
*/
void CancelOrClose();
void OpenCallback(nfsfh *_fh); void OpenCallback(nfsfh *_fh);
void StatCallback(const struct stat *st); void StatCallback(const struct stat *st);