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 80540e33f1ec340c4926c95bf40f3904228a31ab..71313a8a8520276823ec4c7c281fa336c9a9c7db 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6282,6 +6282,13 @@ F:       drivers/mtd/ubi/
 F:     include/linux/mtd/ubi.h
 F:     include/mtd/ubi-user.h
 
+UNIONFS
+P:     Josef "Jeff" Sipek
+M:     jsipek@cs.sunysb.edu
+L:     unionfs@filesystems.org
+W:     http://www.unionfs.org
+S:     Maintained
+
 USB ACM DRIVER
 M:     Oliver Neukum <oliver@neukum.name>
 L:     linux-usb@vger.kernel.org

diff --git a/fs/Kconfig b/fs/Kconfig
index 3db9caa57edcbfcf260436b4cd4fb15e3fc070f4..3d2e791bbd48ed62017f526e278b25366fad1a6f 100644 (file)
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -191,6 +191,16 @@ source "fs/sysv/Kconfig"
 source "fs/ufs/Kconfig"
 source "fs/exofs/Kconfig"
 
+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
+
 endif # MISC_FILESYSTEMS
 
 menuconfig NETWORK_FILESYSTEMS

diff --git a/fs/Makefile b/fs/Makefile
index a7f7cef0c0c8343da03006fe39d5cce1a6bd225a..672664b7975d621ff784a4fa4f6cc46fe36d6315 100644 (file)
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -81,6 +81,7 @@ obj-$(CONFIG_ISO9660_FS)      += isofs/
 obj-$(CONFIG_HFSPLUS_FS)       += hfsplus/ # Before hfs to find wrapped HFS+
 obj-$(CONFIG_HFS_FS)           += hfs/
 obj-$(CONFIG_ECRYPT_FS)                += ecryptfs/
+obj-$(CONFIG_UNION_FS)         += unionfs/
 obj-$(CONFIG_VXFS_FS)          += freevxfs/
 obj-$(CONFIG_NFS_FS)           += nfs/
 obj-$(CONFIG_EXPORTFS)         += exportfs/

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