mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #23640 from owncloud/backport-23545-lock-mountpoint-on-removal 

[9.0] Lock the mountpoint while removing
This commit is contained in:
Thomas Müller 2016-03-31 08:59:28 +02:00
parent 8d6aff69a8 7c7e079a36
commit 835e24826d
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/private/files/view.php
View File

@ -269,17 +269,21 @@ class View {
// cut of /user/files to get the relative path to data/user/files // cut of /user/files to get the relative path to data/user/files
$pathParts = explode('/', $path, 4); $pathParts = explode('/', $path, 4);
$relPath = '/' . $pathParts[3]; $relPath = '/' . $pathParts[3];
$this->lockFile($relPath, ILockingProvider::LOCK_SHARED, true);
\OC_Hook::emit( \OC_Hook::emit(
Filesystem::CLASSNAME, "umount", Filesystem::CLASSNAME, "umount",
array(Filesystem::signal_param_path => $relPath) array(Filesystem::signal_param_path => $relPath)
); );
$this->changeLock($relPath, ILockingProvider::LOCK_EXCLUSIVE, true);
$result = $mount->removeMount(); $result = $mount->removeMount();
$this->changeLock($relPath, ILockingProvider::LOCK_SHARED, true);
if ($result) { if ($result) {
\OC_Hook::emit( \OC_Hook::emit(
Filesystem::CLASSNAME, "post_umount", Filesystem::CLASSNAME, "post_umount",
array(Filesystem::signal_param_path => $relPath) array(Filesystem::signal_param_path => $relPath)
); );
} }
$this->unlockFile($relPath, ILockingProvider::LOCK_SHARED, true);
return $result; return $result;
} else { } else {
// do not allow deleting the storage's root / the mount point // do not allow deleting the storage's root / the mount point