Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit ef94b1864d1ed5be54376404bb23d22ed0481feb

Authored by Miklos Szeredi
1 parent fc14f9c127
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

ovl: rename filesystem type to "overlay" 

Some distributions carry an "old" format of overlayfs while mainline has a
"new" format.

The distros will possibly want to keep the old overlayfs alongside the new
for compatibility reasons.

To make it possible to differentiate the two versions change the name of
the new one from "overlayfs" to "overlay".

Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Reported-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Cc: Andy Whitcroft <apw@canonical.com>

Showing 6 changed files with 9 additions and 9 deletions Side-by-side Diff

Documentation/filesystems/overlayfs.txt
Diff comments   View file @ ef94b18
... ... @@ -64,7 +64,7 @@
64 64 At mount time, the two directories given as mount options "lowerdir" and
65 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 68 workdir=/work /merged
69 69  
70 70 The "workdir" needs to be an empty directory on the same filesystem
... ... @@ -6888,7 +6888,7 @@
6888 6888 F: include/scsi/osd_*
6889 6889 F: fs/exofs/
6890 6890  
6891   -OVERLAYFS FILESYSTEM
  6891 +OVERLAY FILESYSTEM
6892 6892 M: Miklos Szeredi <miklos@szeredi.hu>
6893 6893 L: linux-fsdevel@vger.kernel.org
6894 6894 S: Supported
... ... @@ -104,7 +104,7 @@
104 104 obj-$(CONFIG_AUTOFS4_FS) += autofs4/
105 105 obj-$(CONFIG_ADFS_FS) += adfs/
106 106 obj-$(CONFIG_FUSE_FS) += fuse/
107   -obj-$(CONFIG_OVERLAYFS_FS) += overlayfs/
  107 +obj-$(CONFIG_OVERLAY_FS) += overlayfs/
108 108 obj-$(CONFIG_UDF_FS) += udf/
109 109 obj-$(CONFIG_SUN_OPENPROMFS) += openpromfs/
110 110 obj-$(CONFIG_OMFS_FS) += omfs/
fs/overlayfs/Kconfig
Diff comments   View file @ ef94b18
1   -config OVERLAYFS_FS
  1 +config OVERLAY_FS
2 2 tristate "Overlay filesystem support"
3 3 help
4 4 An overlay filesystem combines two filesystems - an 'upper' filesystem
fs/overlayfs/Makefile
Diff comments   View file @ ef94b18
... ... @@ -2,7 +2,7 @@
2 2 # Makefile for the overlay filesystem.
3 3 #
4 4  
5   -obj-$(CONFIG_OVERLAYFS_FS) += overlayfs.o
  5 +obj-$(CONFIG_OVERLAY_FS) += overlay.o
6 6  
7   -overlayfs-objs := super.o inode.o dir.o readdir.o copy_up.o
  7 +overlay-objs := super.o inode.o dir.o readdir.o copy_up.o
fs/overlayfs/super.c
Diff comments   View file @ ef94b18
... ... @@ -24,7 +24,7 @@
24 24 MODULE_DESCRIPTION("Overlay filesystem");
25 25 MODULE_LICENSE("GPL");
26 26  
27   -#define OVERLAYFS_SUPER_MAGIC 0x794c764f
  27 +#define OVERLAYFS_SUPER_MAGIC 0x794c7630
28 28  
29 29 struct ovl_config {
30 30 char *lowerdir;
31 31  
... ... @@ -776,11 +776,11 @@
776 776  
777 777 static struct file_system_type ovl_fs_type = {
778 778 .owner = THIS_MODULE,
779   - .name = "overlayfs",
  779 + .name = "overlay",
780 780 .mount = ovl_mount,
781 781 .kill_sb = kill_anon_super,
782 782 };
783   -MODULE_ALIAS_FS("overlayfs");
  783 +MODULE_ALIAS_FS("overlay");
784 784  
785 785 static int __init ovl_init(void)
786 786 {