diff --git a/lib/private/files/storage/wrapper/lockingwrapper.php b/lib/private/files/storage/wrapper/lockingwrapper.php
index 61710ed2de638d7b52aabe1f0d8ae56884789baa..4f41c528253d21cd35796afea7e8e0da6edb1d5e 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 499957bd80397350f38873dee78d861e427b0d50..196134724d30397be17959af3d2a18367808b292 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);