From 7fa1a84ec37ba6e891d2eb9d557cf3ddfb902023 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sun, 14 Dec 2014 15:38:09 +0100 Subject: lib/nfs/Connection: move code to method InternalClose() --- src/lib/nfs/Connection.cxx | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'src/lib/nfs/Connection.cxx') diff --git a/src/lib/nfs/Connection.cxx b/src/lib/nfs/Connection.cxx index c62b11acb..433d49ecf 100644 --- a/src/lib/nfs/Connection.cxx +++ b/src/lib/nfs/Connection.cxx @@ -331,12 +331,22 @@ DummyCallback(int, struct nfs_context *, void *, void *) { } +inline void +NfsConnection::InternalClose(struct nfsfh *fh) +{ + assert(GetEventLoop().IsInside()); + assert(context != nullptr); + assert(fh != nullptr); + + nfs_close_async(context, fh, DummyCallback, nullptr); +} + void NfsConnection::Close(struct nfsfh *fh) { assert(GetEventLoop().IsInside()); - nfs_close_async(context, fh, DummyCallback, nullptr); + InternalClose(fh); ScheduleSocket(); } @@ -424,8 +434,7 @@ NfsConnection::OnSocketReady(unsigned flags) #endif while (!deferred_close.empty()) { - nfs_close_async(context, deferred_close.front(), - DummyCallback, nullptr); + InternalClose(deferred_close.front()); deferred_close.pop_front(); } -- cgit v1.2.3