head	1.1;
access;
symbols
	LKML-branch:1.1.0.2;
locks; strict;
comment	@# @;


1.1
date	2006.10.12.07.27.08;	author jsipek;	state dead;
branches
	1.1.2.1;
next	;

1.1.2.1
date	2006.10.12.07.27.08;	author jsipek;	state Exp;
branches;
next	;


desc
@@


1.1
log
@file 23-makefile was initially added on branch LKML-branch.
@
text
@@


1.1.2.1
log
@Try3, sent to akpm for inclusion in -mm
@
text
@a0 85
From jsipek@@cs.sunysb.edu Thu Oct 12 02:19:01 2006
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [PATCH 23 of 23][-mm] Unionfs: Kconfig and Makefile
Message-Id: <c7102e576dab93ff1198.1160633940@@thor.fsl.cs.sunysb.edu>
In-Reply-To: <patchbomb.1160633917@@thor.fsl.cs.sunysb.edu>
Date: Thu, 12 Oct 2006 02:19:00 -0400
From: Josef "Jeff" Sipek <jsipek@@cs.sunysb.edu>
To: akpm@@osdl.org

From: Josef "Jeff" Sipek <jsipek@@cs.sunysb.edu>

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>

---

4 files changed, 23 insertions(+)
MAINTAINERS         |    7 +++++++
fs/Kconfig          |   10 ++++++++++
fs/Makefile         |    1 +
fs/unionfs/Makefile |    5 +++++

diff --git a/MAINTAINERS b/MAINTAINERS
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@@ -3061,6 +3061,13 @@@@ W:	http://www.kernel.dk
 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
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@@@ -1588,6 +1588,16 @@@@ config UFS_DEBUG
 	  If you are experiencing any problems with the UFS filesystem, say
 	  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
 
diff --git a/fs/Makefile b/fs/Makefile
--- a/fs/Makefile
+++ b/fs/Makefile
@@@@ -117,3 +117,4 @@@@ obj-$(CONFIG_DEBUG_FS)		+= debugfs/
 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
--- /dev/null
+++ b/fs/unionfs/Makefile
@@@@ -0,0 +1,5 @@@@
+obj-$(CONFIG_UNION_FS) += unionfs.o
+
+unionfs-objs := 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


@

