Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef94b186 authored by Miklos Szeredi's avatar Miklos Szeredi
Browse files

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: default avatarMiklos Szeredi <mszeredi@suse.cz>
Reported-by: default avatarSerge Hallyn <serge.hallyn@ubuntu.com>
Cc: Andy Whitcroft <apw@canonical.com>
parent fc14f9c1

Documentation/filesystems/overlayfs.txt

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ is formed. 
At mount time, the two directories given as mount options "lowerdir" and

"upperdir" are combined into a merged directory:



  mount -t overlayfs overlayfs -olowerdir=/lower,upperdir=/upper,\

  mount -t overlay overlay -olowerdir=/lower,upperdir=/upper,\

workdir=/work /merged



The "workdir" needs to be an empty directory on the same filesystem

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -6888,7 +6888,7 @@ F: drivers/scsi/osd/ 
F:	include/scsi/osd_*

F:	fs/exofs/



OVERLAYFS FILESYSTEM

OVERLAY FILESYSTEM

M:	Miklos Szeredi <miklos@szeredi.hu>

L:	linux-fsdevel@vger.kernel.org

S:	Supported

fs/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ obj-$(CONFIG_QNX6FS_FS) += qnx6/ 
obj-$(CONFIG_AUTOFS4_FS)	+= autofs4/

obj-$(CONFIG_ADFS_FS)		+= adfs/

obj-$(CONFIG_FUSE_FS)		+= fuse/

obj-$(CONFIG_OVERLAYFS_FS)	+= overlayfs/

obj-$(CONFIG_OVERLAY_FS)	+= overlayfs/

obj-$(CONFIG_UDF_FS)		+= udf/

obj-$(CONFIG_SUN_OPENPROMFS)	+= openpromfs/

obj-$(CONFIG_OMFS_FS)		+= omfs/

fs/overlayfs/Kconfig

+1 −1
Original line number Diff line number Diff line 
config OVERLAYFS_FS

config OVERLAY_FS

	tristate "Overlay filesystem support"

	help

	  An overlay filesystem combines two filesystems - an 'upper' filesystem

fs/overlayfs/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -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