diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2015-02-20 04:58:52 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-02-20 04:58:52 -0500 |
commit | ce7b9facdf43b42fb95bdff9069aefeddb7d0a69 (patch) | |
tree | db49cfb72630e88172b51e586acfa9ddb22b5dc1 /Documentation | |
parent | a95104fd3393080e8bcca348f51996f5f0f5ccb6 (diff) | |
parent | 4330397e4e8a662f36d101659e2a59ce32e76ff4 (diff) |
Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs into for-next
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/filesystems/overlayfs.txt | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/Documentation/filesystems/overlayfs.txt b/Documentation/filesystems/overlayfs.txt index a27c950ece61..6db0e5d1da07 100644 --- a/Documentation/filesystems/overlayfs.txt +++ b/Documentation/filesystems/overlayfs.txt | |||
@@ -159,6 +159,22 @@ overlay filesystem (though an operation on the name of the file such as | |||
159 | rename or unlink will of course be noticed and handled). | 159 | rename or unlink will of course be noticed and handled). |
160 | 160 | ||
161 | 161 | ||
162 | Multiple lower layers | ||
163 | --------------------- | ||
164 | |||
165 | Multiple lower layers can now be given using the the colon (":") as a | ||
166 | separator character between the directory names. For example: | ||
167 | |||
168 | mount -t overlay overlay -olowerdir=/lower1:/lower2:/lower3 /merged | ||
169 | |||
170 | As the example shows, "upperdir=" and "workdir=" may be omitted. In | ||
171 | that case the overlay will be read-only. | ||
172 | |||
173 | The specified lower directories will be stacked beginning from the | ||
174 | rightmost one and going left. In the above example lower1 will be the | ||
175 | top, lower2 the middle and lower3 the bottom layer. | ||
176 | |||
177 | |||
162 | Non-standard behavior | 178 | Non-standard behavior |
163 | --------------------- | 179 | --------------------- |
164 | 180 | ||
@@ -196,3 +212,15 @@ Changes to the underlying filesystems while part of a mounted overlay | |||
196 | filesystem are not allowed. If the underlying filesystem is changed, | 212 | filesystem are not allowed. If the underlying filesystem is changed, |
197 | the behavior of the overlay is undefined, though it will not result in | 213 | the behavior of the overlay is undefined, though it will not result in |
198 | a crash or deadlock. | 214 | a crash or deadlock. |
215 | |||
216 | Testsuite | ||
217 | --------- | ||
218 | |||
219 | There's testsuite developed by David Howells at: | ||
220 | |||
221 | git://git.infradead.org/users/dhowells/unionmount-testsuite.git | ||
222 | |||
223 | Run as root: | ||
224 | |||
225 | # cd unionmount-testsuite | ||
226 | # ./run --ov | ||