mirror of
https://github.com/nextcloud/server.git
synced 2026-06-10 09:13:19 -04:00
fix: ensure nested mount points are handled in the correct order
Signed-off-by: Robin Appelman <robin@icewind.nl>
This commit is contained in:
parent
d595946b0e
commit
5ab8439c00
1 changed files with 7 additions and 0 deletions
|
|
@ -1514,6 +1514,13 @@ class View {
|
|||
|
||||
//add a folder for any mountpoint in this directory and add the sizes of other mountpoints to the folders
|
||||
$mounts = Filesystem::getMountManager()->findIn($path);
|
||||
|
||||
// make sure nested mounts are sorted after their parent mounts
|
||||
// otherwise doesn't propagate the etag across storage boundaries correctly
|
||||
usort($mounts, function (IMountPoint $a, IMountPoint $b) {
|
||||
return $a->getMountPoint() <=> $b->getMountPoint();
|
||||
});
|
||||
|
||||
$dirLength = strlen($path);
|
||||
foreach ($mounts as $mount) {
|
||||
$mountPoint = $mount->getMountPoint();
|
||||
|
|
|
|||
Loading…
Reference in a new issue