diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-22 17:15:27 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-22 17:15:27 -0500 |
| commit | ecde00642c79c2dfc9006e7751ee60bd0e21e1e9 (patch) | |
| tree | de4cca84e38a44c46a0d8f82b47aa96dba44c8e9 /Documentation | |
| parent | 8a84e01e147f44111988f9d8ccd2eaa30215a0f2 (diff) | |
| parent | 3035b675ad0377b2468b442068062e7f28771dda (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs fixes from Al Viro:
"Assorted fixes, most in overlayfs land"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
ovl: ovl_dir_fsync() cleanup
ovl: update MAINTAINERS
ovl: pass dentry into ovl_dir_read_merged()
ovl: use lockless_dereference() for upperdentry
ovl: allow filenames with comma
ovl: fix race in private xattr checks
ovl: fix remove/copy-up race
ovl: rename filesystem type to "overlay"
isofs: avoid unused function warning
vfs: fix reference leak in d_prune_aliases()
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/filesystems/overlayfs.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/filesystems/overlayfs.txt b/Documentation/filesystems/overlayfs.txt index 530850a72735..a27c950ece61 100644 --- a/Documentation/filesystems/overlayfs.txt +++ b/Documentation/filesystems/overlayfs.txt | |||
| @@ -64,7 +64,7 @@ is formed. | |||
| 64 | At mount time, the two directories given as mount options "lowerdir" and | 64 | At mount time, the two directories given as mount options "lowerdir" and |
| 65 | "upperdir" are combined into a merged directory: | 65 | "upperdir" are combined into a merged directory: |
| 66 | 66 | ||
| 67 | mount -t overlayfs overlayfs -olowerdir=/lower,upperdir=/upper,\ | 67 | mount -t overlay overlay -olowerdir=/lower,upperdir=/upper,\ |
| 68 | workdir=/work /merged | 68 | workdir=/work /merged |
| 69 | 69 | ||
| 70 | The "workdir" needs to be an empty directory on the same filesystem | 70 | The "workdir" needs to be an empty directory on the same filesystem |