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 <jsipek@cs.sunysb.edu>
Signed-off-by: David Quigley <dquigley@fsl.cs.sunysb.edu>
Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu>

diff --git a/MAINTAINERS b/MAINTAINERS
index 56a2f678019e7c067e62ce7a95c1fb86ade5df2d..9172db8efea577510195d8e32daf1df7050d39f4 100644 (file)
--- 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 2694648cbd1b6e7d235bc6dbb46cffa62482294d..759140dec15e838900aed95beb9acaf98c9d8fd9 100644 (file)
--- 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 <http://www.unionfs.org> for details
+
 endmenu
 
 menuconfig NETWORK_FILESYSTEMS

diff --git a/fs/Makefile b/fs/Makefile
index 1e7a11bd4da116f888a4589925dea958fa6ec5f9..22ebb61cd5217f48da531a28df6b71f03ed998bd 100644 (file)
--- 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 (file)
index 0000000..25dd78f
--- /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