1.1 --- a/libfsserver/lib/generic/provider_registry.cc Fri Dec 31 00:56:25 2021 +0100
1.2 +++ b/libfsserver/lib/generic/provider_registry.cc Tue Jan 04 19:22:01 2022 +0100
1.3 @@ -21,6 +21,10 @@
1.4
1.5 #include "provider_registry.h"
1.6
1.7 +/* To complete forward declaration. */
1.8 +
1.9 +#include "provider.h"
1.10 +
1.11
1.12
1.13 /* Methods for use with the lock already acquired. */
1.14 @@ -28,10 +32,10 @@
1.15 /* Return any registered provider for the given 'fileid' or NULL if no such
1.16 provider is registered. */
1.17
1.18 -Accountable *ProviderRegistry::get(fileid_t fileid)
1.19 +Provider *ProviderRegistry::get(fileid_t fileid)
1.20 {
1.21 - FileMapping::iterator entry = _providers.find(fileid);
1.22 - Accountable *provider;
1.23 + ProviderMapping::iterator entry = _providers.find(fileid);
1.24 + Provider *provider;
1.25
1.26 if (entry == _providers.end())
1.27 provider = NULL;
1.28 @@ -43,7 +47,7 @@
1.29
1.30 /* Remove a provider and its resources for the given 'fileid'. */
1.31
1.32 -void ProviderRegistry::remove(fileid_t fileid, Accountable *provider)
1.33 +void ProviderRegistry::remove(fileid_t fileid, Provider *provider)
1.34 {
1.35 _providers.erase(fileid);
1.36 delete provider;
1.37 @@ -51,9 +55,9 @@
1.38
1.39 /* Register a 'provider' for the given 'fileid'. */
1.40
1.41 -void ProviderRegistry::set(fileid_t fileid, Accountable *provider)
1.42 +void ProviderRegistry::set(fileid_t fileid, Provider *provider)
1.43 {
1.44 - FileMapping::iterator entry = _providers.find(fileid);
1.45 + ProviderMapping::iterator entry = _providers.find(fileid);
1.46
1.47 if (entry != _providers.end())
1.48 return;
1.49 @@ -65,7 +69,7 @@
1.50
1.51 /* Detach from a provider, potentially removing it from the registry. */
1.52
1.53 -void ProviderRegistry::detach(fileid_t fileid, Accountable *provider)
1.54 +void ProviderRegistry::detach(fileid_t fileid, Provider *provider)
1.55 {
1.56 std::lock_guard<std::mutex> guard(_lock);
1.57