Merge branch 'master' into clean_up_util

Conflicts:
	lib/util.php

2 files changed, 14 insertions, 0 deletions

diff --git a/lib/files/mount/manager.php b/lib/files/mount/manager.php
index 25a5fe241cc..4c432dcf724 100644
--- a/lib/files/mount/manager.php
+++ b/lib/files/mount/manager.php
@@ -96,6 +96,13 @@ class Manager {
 	}
 
 	/**
+	 * @return Mount[]
+	 */
+	public function getAll() {
+		return $this->mounts;
+	}
+
+	/**
 	 * Find mounts by numeric storage id
 	 *
 	 * @param string $id
diff --git a/lib/files/mount/mount.php b/lib/files/mount/mount.php
index 17b0055ee84..0ce2f5975c7 100644
--- a/lib/files/mount/mount.php
+++ b/lib/files/mount/mount.php
@@ -138,4 +138,11 @@ class Mount {
 		}
 		return $path;
 	}
+
+	/**
+	 * @param callable $wrapper
+	 */
+	public function wrapStorage($wrapper) {
+		$this->storage = $wrapper($this->mountPoint, $this->storage);
+	}
 }