1.1 --- a/libfsserver/lib/directories/directory_resource.cc Sun Oct 17 21:55:37 2021 +0200
1.2 +++ b/libfsserver/lib/directories/directory_resource.cc Sun Oct 17 22:10:09 2021 +0200
1.3 @@ -30,9 +30,8 @@
1.4
1.5
1.6 DirectoryResource::DirectoryResource(fileid_t fileid,
1.7 - DirectoryProvider *provider,
1.8 - FileRegistry *registry)
1.9 -: _registry(registry), _provider(provider), fileid(fileid)
1.10 + DirectoryProvider *provider)
1.11 +: _provider(provider), fileid(fileid)
1.12 {
1.13 }
1.14
1.15 @@ -61,15 +60,15 @@
1.16 {
1.17 /* Detach the resource, potentially removing the file provider. */
1.18
1.19 - _registry->detach(fileid, _provider);
1.20 + _provider->registry()->detach(fileid, _provider);
1.21 }
1.22
1.23
1.24
1.25 /* Thread payload for directory listing production. */
1.26
1.27 -static void read_directory(FileRegistry *registry, DirectoryProvider *provider,
1.28 - fileid_t fileid, file_t *writer)
1.29 +static void read_directory(DirectoryProvider *provider, fileid_t fileid,
1.30 + file_t *writer)
1.31 {
1.32 DirectoryAccessor *accessor = provider->accessor();
1.33
1.34 @@ -85,7 +84,7 @@
1.35 /* Close and detach from the registry. */
1.36
1.37 client_close(writer);
1.38 - registry->detach(fileid, provider);
1.39 + provider->registry()->detach(fileid, provider);
1.40 }
1.41
1.42
1.43 @@ -116,7 +115,7 @@
1.44
1.45 /* Initiate the reading process. */
1.46
1.47 - std::thread(read_directory, _registry, _provider, fileid, writer).detach();
1.48 + std::thread(read_directory, _provider, fileid, writer).detach();
1.49
1.50 /* Send the capability immediately, discarding it afterwards. */
1.51