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

lib/nfs/Connection: remove obsolete debug field "in_destroy"

Browse Source 
This is obsolete because PrepareDestroyContext() no longer calls
nfs_destroy_context().
This commit is contained in:
Max Kellermann 2024-05-13 16:52:24 +02:00
parent ba1b8533a5
commit f0ac0c19b7
2 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/lib/nfs/Connection.cxx
View File

@ -382,11 +382,6 @@ NfsConnection::PrepareDestroyContext() noexcept
{ {
assert(GetEventLoop().IsInside()); assert(GetEventLoop().IsInside());
#ifndef NDEBUG
assert(!in_destroy);
in_destroy = true;
#endif
if (mount_state == MountState::WAITING) { if (mount_state == MountState::WAITING) {
assert(mount_timeout_event.IsPending()); assert(mount_timeout_event.IsPending());
mount_timeout_event.Cancel(); mount_timeout_event.Cancel();
@ -403,11 +398,6 @@ NfsConnection::PrepareDestroyContext() noexcept
callbacks.ForEach([](CancellableCallback &c){ callbacks.ForEach([](CancellableCallback &c){
c.PrepareDestroyContext(); c.PrepareDestroyContext();
}); });
#ifndef NDEBUG
assert(in_destroy);
in_destroy = false;
#endif
} }
inline void inline void
@ -552,7 +542,6 @@ NfsConnection::MountCallback(int status, [[maybe_unused]] nfs_context *nfs,
mount_state = MountState::FINISHED; mount_state = MountState::FINISHED;
assert(mount_timeout_event.IsPending() || in_destroy);
mount_timeout_event.Cancel(); mount_timeout_event.Cancel();
if (status < 0) { if (status < 0) {

5
src/lib/nfs/Connection.hxx
View File

@ -118,11 +118,6 @@ class NfsConnection {
* event updates are omitted. * event updates are omitted.
*/ */
bool in_event = false; bool in_event = false;
/**
* True when DestroyContext() is being called.
*/
bool in_destroy = false;
#endif #endif
public: public: