diff --git a/src/add-ons/kernel/file_systems/packagefs/Volume.cpp b/src/add-ons/kernel/file_systems/packagefs/Volume.cpp index 7b4358c057..809bbb310a 100644 --- a/src/add-ons/kernel/file_systems/packagefs/Volume.cpp +++ b/src/add-ons/kernel/file_systems/packagefs/Volume.cpp @@ -638,23 +638,6 @@ Volume::AddPackageDomain(const char* path) } -void -Volume::_RemovePackageDomain(PackageDomain* domain) -{ - // remove the domain's packages from the node tree - VolumeWriteLocker systemVolumeLocker(_SystemVolumeIfNotSelf()); - VolumeWriteLocker volumeLocker(this); - for (PackageFileNameHashTable::Iterator it - = domain->Packages().GetIterator(); Package* package = it.Next();) { - _RemovePackageContent(package, NULL, false); - } - - // remove the domain - fPackageDomains.Remove(domain); - domain->ReleaseReference(); -} - - void Volume::PackageLinkDirectoryAdded(PackageLinkDirectory* directory) { @@ -806,6 +789,23 @@ Volume::_AddPackageDomain(PackageDomain* domain, bool notify) } +void +Volume::_RemovePackageDomain(PackageDomain* domain) +{ + // remove the domain's packages from the node tree + VolumeWriteLocker systemVolumeLocker(_SystemVolumeIfNotSelf()); + VolumeWriteLocker volumeLocker(this); + for (PackageFileNameHashTable::Iterator it + = domain->Packages().GetIterator(); Package* package = it.Next();) { + _RemovePackageContent(package, NULL, false); + } + + // remove the domain + fPackageDomains.Remove(domain); + domain->ReleaseReference(); +} + + status_t Volume::_LoadPackage(Package* package) {