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>
Conflicts:

	fs/Makefile

diff --git a/MAINTAINERS b/MAINTAINERS
index a34c53c08742359258033294993de8c6e3a3d0dd..8d879ce9d7ba43d38a3bb5e7881d610287276837 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2929,6 +2929,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 3f00a9faabcb6314e2ddfb6fd56b013d95059436..a409d0688f53e38b3d66c496cbb7df950e2f0d39 100644 (file)
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -1394,6 +1394,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
 
 menu "Network File Systems"

diff --git a/fs/Makefile b/fs/Makefile
index 89135428a539184580b2b0305ec46f6e7d5bfa86..aed5211dd2c91af0581ab8240d55f1fe87a9291e 100644 (file)
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -102,3 +102,5 @@ obj-$(CONFIG_HOSTFS)                += hostfs/
 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