commit 161418fff20b373ff9807cb19b0aeebec9aaec1a
Author: Josef "Jeff" Sipek <[EMAIL PROTECTED]>
Date: Sun Jan 28 15:10:20 2007 -0500
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 <[EMAIL PROTECTED]>
Signed-off-by: David Quigley <[EMAIL PROTECTED]>
Signed-off-by: Erez Zadok <[EMAIL PROTECTED]>
diff --git a/MAINTAINERS b/MAINTAINERS
index df40a4e..55a3690 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3593,6 +3593,13 @@ L: [EMAIL PROTECTED]
W: http://www.kernel.dk
S: Maintained
+UNIONFS
+P: Josef "Jeff" Sipek
+M: [EMAIL PROTECTED]
+L: [EMAIL PROTECTED]
+W: http://www.unionfs.org
+S: Maintained
+
USB ACM DRIVER
P: Oliver Neukum
M: [EMAIL PROTECTED]
diff --git a/fs/Kconfig b/fs/Kconfig
index 0fa0c11..0edae09 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -1517,6 +1517,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 720c29d..951f411 100644
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -118,3 +118,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 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
_______________________________________________
unionfs-cvs mailing list: http://unionfs.filesystems.org/
[email protected]
http://www.fsl.cs.sunysb.edu/mailman/listinfo/unionfs-cvs
