From caf2279507a83de762041d96e760832a8e8ddcc5 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Fri, 7 Mar 2025 17:52:06 +0100 Subject: fix: skip registering mounts if there are no new mount providers Signed-off-by: Robin Appelman --- lib/private/Files/SetupManager.php | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'lib') diff --git a/lib/private/Files/SetupManager.php b/lib/private/Files/SetupManager.php index 8f4c3a3311f..51b68d06166 100644 --- a/lib/private/Files/SetupManager.php +++ b/lib/private/Files/SetupManager.php @@ -271,18 +271,20 @@ class SetupManager { private function afterUserFullySetup(IUser $user, array $previouslySetupProviders): void { $this->eventLogger->start('fs:setup:user:full:post', 'Housekeeping after user is setup'); $userRoot = '/' . $user->getUID() . '/'; - $mounts = $this->mountManager->getAll(); - $mounts = array_filter($mounts, function (IMountPoint $mount) use ($userRoot) { - return str_starts_with($mount->getMountPoint(), $userRoot); - }); $allProviders = array_map(function ($provider) { return get_class($provider); }, array_merge($this->mountProviderCollection->getProviders(), $this->mountProviderCollection->getHomeProviders())); $newProviders = array_diff($allProviders, $previouslySetupProviders); - $mounts = array_filter($mounts, function (IMountPoint $mount) use ($previouslySetupProviders) { - return !in_array($mount->getMountProvider(), $previouslySetupProviders); - }); - $this->userMountCache->registerMounts($user, $mounts, $newProviders); + if (count($newProviders) > 0) { + $mounts = $this->mountManager->getAll(); + $mounts = array_filter($mounts, function (IMountPoint $mount) use ($userRoot, $previouslySetupProviders) { + if (!str_starts_with($mount->getMountPoint(), $userRoot)) { + return false; + } + return !in_array($mount->getMountProvider(), $previouslySetupProviders); + }); + $this->userMountCache->registerMounts($user, $mounts, $newProviders); + } $cacheDuration = $this->config->getSystemValueInt('fs_mount_cache_duration', 5 * 60); if ($cacheDuration > 0) { -- cgit v1.2.3