diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2014-11-21 19:51:08 +0300 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-11-21 19:51:08 +0300 |
| commit | 3035b675ad0377b2468b442068062e7f28771dda (patch) | |
| tree | 63cf26aa249d067ac12776dd2850ff017747f2b9 /fs/overlayfs/Makefile | |
| parent | 7ca2f234404e738cc807ed87c43f9932513bc8c6 (diff) | |
| parent | 7676895f4736421ebafc48de5078e25ea69e88ee (diff) | |
| download | linux-3035b675ad0377b2468b442068062e7f28771dda.tar.xz | |
Merge branch 'overlayfs-current' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs into for-linus
"The biggest change is to rename the filesystem from "overlayfs" to "overlay".
This will allow legacy overlayfs to be easily carried by distros alongside the
new mainline one. Also fix a couple of copy-up races and allow escaping comma
character in filenames."
The last bit is about commas in pathname mount options...
Diffstat (limited to 'fs/overlayfs/Makefile')
| -rw-r--r-- | fs/overlayfs/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/overlayfs/Makefile b/fs/overlayfs/Makefile index 8f91889480d0..900daed3e91d 100644 --- a/fs/overlayfs/Makefile +++ b/fs/overlayfs/Makefile @@ -2,6 +2,6 @@ # Makefile for the overlay filesystem. # -obj-$(CONFIG_OVERLAYFS_FS) += overlayfs.o +obj-$(CONFIG_OVERLAY_FS) += overlay.o -overlayfs-objs := super.o inode.o dir.o readdir.o copy_up.o +overlay-objs := super.o inode.o dir.o readdir.o copy_up.o |