From: Josef "Jeff" Sipek Date: Sun, 28 Jan 2007 20:10:20 +0000 (-0500) Subject: Unionfs: Kconfig and Makefile X-Git-Tag: unionfs-2.1.1~221 X-Git-Url: https://git.fsl.cs.stonybrook.edu/?a=commitdiff_plain;h=e96b358edf17923109124a3baaa7f64d63b03866;p=unionfs-2.6.26.y.git Unionfs: Kconfig and Makefile This patch contains the changes to fs Kconfig file, Makefiles, and Maintainers file for Unionfs. Signed-off-by: Josef "Jeff" Sipek Signed-off-by: David Quigley Signed-off-by: Erez Zadok --- diff --git a/MAINTAINERS b/MAINTAINERS index 56a2f678019..9172db8efea 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4093,6 +4093,13 @@ L: linux-kernel@vger.kernel.org W: http://www.kernel.dk S: Maintained +UNIONFS +P: Josef "Jeff" Sipek +M: jsipek@cs.sunysb.edu +L: unionfs@filesystems.org +W: http://www.unionfs.org +S: Maintained + USB ACM DRIVER P: Oliver Neukum M: oliver@neukum.name diff --git a/fs/Kconfig b/fs/Kconfig index 2694648cbd1..759140dec15 100644 --- a/fs/Kconfig +++ b/fs/Kconfig @@ -1577,6 +1577,16 @@ config UFS_DEBUG Y here. This will result in _many_ additional debugging messages to be written to the system log. +config UNION_FS + tristate "Union file system (EXPERIMENTAL)" + depends on EXPERIMENTAL + help + Unionfs is a stackable unification file system, which appears to + merge the contents of several directories (branches), while keeping + their physical content separate. + + See for details + endmenu menuconfig NETWORK_FILESYSTEMS diff --git a/fs/Makefile b/fs/Makefile index 1e7a11bd4da..22ebb61cd52 100644 --- a/fs/Makefile +++ b/fs/Makefile @@ -119,3 +119,4 @@ obj-$(CONFIG_HPPFS) += hppfs/ obj-$(CONFIG_DEBUG_FS) += debugfs/ obj-$(CONFIG_OCFS2_FS) += ocfs2/ obj-$(CONFIG_GFS2_FS) += gfs2/ +obj-$(CONFIG_UNION_FS) += unionfs/ diff --git a/fs/unionfs/Makefile b/fs/unionfs/Makefile new file mode 100644 index 00000000000..25dd78f411e --- /dev/null +++ b/fs/unionfs/Makefile @@ -0,0 +1,5 @@ +obj-$(CONFIG_UNION_FS) += unionfs.o + +unionfs-y := subr.o dentry.o file.o inode.o main.o super.o \ + stale_inode.o branchman.o rdstate.o copyup.o dirhelper.o \ + rename.o unlink.o lookup.o commonfops.o dirfops.o sioq.o