[PATCH] FUSE - MAINTAINERS, Kconfig and Makefile changes

This patch adds FUSE filesystem to MAINTAINERS, fs/Kconfig and
fs/Makefile.

Signed-off-by: Miklos Szeredi <miklos@szeredi.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/MAINTAINERS b/MAINTAINERS
index 9c9a86d0685a5f9e55a054bf9a7b36a5d7c9dbe4..f038dca34ee826b543db0d54f40623e954e5bf72 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -931,6 +931,13 @@ L: linux-tape@vger.kernel.org
 W:     http://sourceforge.net/projects/ftape
 S:     Orphan
 
+FUSE: FILESYSTEM IN USERSPACE
+P:     Miklos Szeredi
+M:     miklos@szeredi.hu
+L:     fuse-devel@lists.sourceforge.net
+W:     http://fuse.sourceforge.net/
+S:     Maintained
+
 FUTURE DOMAIN TMC-16x0 SCSI DRIVER (16-bit)
 P:     Rik Faith
 M:     faith@cs.unc.edu

diff --git a/fs/Kconfig b/fs/Kconfig
index 443aed4e20671d9ec8c34d67fe8618ec1667c9a2..068ccea2f184b5beadb2add2a59a86305e0487d3 100644 (file)
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -462,6 +462,19 @@ config AUTOFS4_FS
          local network, you probably do not need an automounter, and can say
          N here.
 
+config FUSE_FS
+       tristate "Filesystem in Userspace support"
+       help
+         With FUSE it is possible to implement a fully functional filesystem
+         in a userspace program.
+
+         There's also companion library: libfuse.  This library along with
+         utilities is available from the FUSE homepage:
+         <http://fuse.sourceforge.net/>
+
+         If you want to develop a userspace FS, or if you want to use
+         a filesystem based on FUSE, answer Y or M.
+
 menu "CD-ROM/DVD Filesystems"
 
 config ISO9660_FS

diff --git a/fs/Makefile b/fs/Makefile
index d646502c1efb3c6a53c4a69dccc74a9036363fbe..1972da186272906d8aa13eab878b547e44ae1398 100644 (file)
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -89,6 +89,7 @@ obj-$(CONFIG_QNX4FS_FS)               += qnx4/
 obj-$(CONFIG_AUTOFS_FS)                += autofs/
 obj-$(CONFIG_AUTOFS4_FS)       += autofs4/
 obj-$(CONFIG_ADFS_FS)          += adfs/
+obj-$(CONFIG_FUSE_FS)          += fuse/
 obj-$(CONFIG_UDF_FS)           += udf/
 obj-$(CONFIG_RELAYFS_FS)       += relayfs/
 obj-$(CONFIG_SUN_OPENPROMFS)   += openpromfs/