diff options
| author | Max Kellermann <max@duempel.org> | 2014-10-01 22:07:56 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-10-01 22:10:05 +0200 |
| commit | 777360149d45cc07c40b53a1c1b7ab903b2b8b84 (patch) | |
| tree | d57512e462d72766b193b5e2d55f0c3d532c90c3 /src/lib | |
| parent | aa7774b82bc2f32fe3f91f2d8aa416d65efa71ec (diff) | |
| download | mpd-777360149d45cc07c40b53a1c1b7ab903b2b8b84.tar.gz mpd-777360149d45cc07c40b53a1c1b7ab903b2b8b84.tar.xz mpd-777360149d45cc07c40b53a1c1b7ab903b2b8b84.zip | |
lib/nfs/Connection: remove obsolete flag postponed_destroy
Diffstat (limited to '')
| -rw-r--r-- | src/lib/nfs/Connection.cxx | 10 | ||||
| -rw-r--r-- | src/lib/nfs/Connection.hxx | 10 |
2 files changed, 2 insertions, 18 deletions
diff --git a/src/lib/nfs/Connection.cxx b/src/lib/nfs/Connection.cxx index 934cf0a49..cd6f1e2ef 100644 --- a/src/lib/nfs/Connection.cxx +++ b/src/lib/nfs/Connection.cxx @@ -263,7 +263,6 @@ NfsConnection::OnSocketReady(unsigned flags) assert(!in_service); in_service = true; - postponed_destroy = false; int result = nfs_service(context, events_to_libnfs(flags)); @@ -271,14 +270,7 @@ NfsConnection::OnSocketReady(unsigned flags) assert(in_service); in_service = false; - if (postponed_destroy) { - /* somebody has called nfs_client_free() while we were inside - nfs_service() */ - const ScopeLock protect(mutex); - DestroyContext(); - closed = true; - // TODO? nfs_client_cleanup_files(client); - } else if (!was_mounted && mount_finished) { + if (!was_mounted && mount_finished) { const ScopeLock protect(mutex); if (postponed_mount_error.IsDefined()) { diff --git a/src/lib/nfs/Connection.hxx b/src/lib/nfs/Connection.hxx index 8a66b9977..4b570513e 100644 --- a/src/lib/nfs/Connection.hxx +++ b/src/lib/nfs/Connection.hxx @@ -75,9 +75,7 @@ class NfsConnection : SocketMonitor, DeferredMonitor { Error postponed_mount_error; /** - * True when nfs_service() is being called. During that, - * nfs_client_free() is postponed, or libnfs will crash. See - * #postponed_destroy. + * True when nfs_service() is being called. */ bool in_service; @@ -87,12 +85,6 @@ class NfsConnection : SocketMonitor, DeferredMonitor { */ bool in_event; - /** - * True when nfs_client_free() has been called while #in_service - * was true. - */ - bool postponed_destroy; - bool mount_finished; public: |