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

dont lock on meta data operations

This commit is contained in:
Robin Appelman 2015-05-13 13:54:15 +02:00
parent 35c377f7a9
commit 1270c6800d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -960,7 +960,7 @@ class View {
if ($run and $storage) { if ($run and $storage) {
if (in_array('write', $hooks) || in_array('delete', $hooks)) { if (in_array('write', $hooks) || in_array('delete', $hooks)) {
$this->lockFile($path, ILockingProvider::LOCK_EXCLUSIVE); $this->lockFile($path, ILockingProvider::LOCK_EXCLUSIVE);
} else { } else if (in_array('read', $hooks)) {
$this->lockFile($path, ILockingProvider::LOCK_SHARED); $this->lockFile($path, ILockingProvider::LOCK_SHARED);
} }
try { try {
@ -972,7 +972,7 @@ class View {
} catch (\Exception $e) { } catch (\Exception $e) {
if (in_array('write', $hooks) || in_array('delete', $hooks)) { if (in_array('write', $hooks) || in_array('delete', $hooks)) {
$this->unlockFile($path, ILockingProvider::LOCK_EXCLUSIVE); $this->unlockFile($path, ILockingProvider::LOCK_EXCLUSIVE);
} else { } else if (in_array('read', $hooks)) {
$this->unlockFile($path, ILockingProvider::LOCK_SHARED); $this->unlockFile($path, ILockingProvider::LOCK_SHARED);
} }
throw $e; throw $e;
@ -992,14 +992,14 @@ class View {
$result = CallbackWrapper::wrap($result, null, null, function () use ($hooks, $path) { $result = CallbackWrapper::wrap($result, null, null, function () use ($hooks, $path) {
if (in_array('write', $hooks)) { if (in_array('write', $hooks)) {
$this->unlockFile($path, ILockingProvider::LOCK_EXCLUSIVE); $this->unlockFile($path, ILockingProvider::LOCK_EXCLUSIVE);
} else { } else if (in_array('read', $hooks)) {
$this->unlockFile($path, ILockingProvider::LOCK_SHARED); $this->unlockFile($path, ILockingProvider::LOCK_SHARED);
} }
}); });
} else { } else {
if (in_array('write', $hooks) || in_array('delete', $hooks)) { if (in_array('write', $hooks) || in_array('delete', $hooks)) {
$this->unlockFile($path, ILockingProvider::LOCK_EXCLUSIVE); $this->unlockFile($path, ILockingProvider::LOCK_EXCLUSIVE);
} else { } else if (in_array('read', $hooks)) {
$this->unlockFile($path, ILockingProvider::LOCK_SHARED); $this->unlockFile($path, ILockingProvider::LOCK_SHARED);
} }
} }