diff options
| -rw-r--r-- | lib/private/files/storage/wrapper/lockingwrapper.php | 3 | ||||
| -rw-r--r-- | lib/public/files/lock.php | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/private/files/storage/wrapper/lockingwrapper.php b/lib/private/files/storage/wrapper/lockingwrapper.php index 61710ed2de6..4f41c528253 100644 --- a/lib/private/files/storage/wrapper/lockingwrapper.php +++ b/lib/private/files/storage/wrapper/lockingwrapper.php @@ -10,7 +10,6 @@ namespace OC\Files\Storage\Wrapper; use OC\Files\Filesystem; -use OCP\Files\LockNotAcquiredException; use OCP\Files\Lock; /** @@ -46,6 +45,8 @@ class LockingWrapper extends Wrapper { /** * Release an existing lock * @param string $path Path to file, relative to this storage + * @param integer $lockType The type of lock to release + * @param bool $releaseAll If true, release all outstanding locks * @return bool true on success, false on failure */ protected function releaseLock($path, $lockType, $releaseAll = false){ diff --git a/lib/public/files/lock.php b/lib/public/files/lock.php index 499957bd803..196134724d3 100644 --- a/lib/public/files/lock.php +++ b/lib/public/files/lock.php @@ -140,10 +140,9 @@ class Lock { * Sets $this->lockFile to the specified lock file, indicating that the lock file is IN USE for this lock instance * Also sets $this->lockFileHandle to a file handle of the lock file * @param string $filename The name of the file to lock - * @param int $timeout Milliseconds to wait for a valid lock * @return bool False if lock can't be acquired, true if it can. */ - protected function lockLockFile ( $filename, $timeout = 0 ) { + protected function lockLockFile ( $filename ) { $lockFile = $this->getLockFile($filename); \OC_Log::write('lock', sprintf('INFO: Locking lock file %s for %s', $lockFile, $filename), \OC_Log::DEBUG); |