1 files changed, 1 insertions, 85 deletions
diff --git a/fs/Kconfig b/fs/Kconfig
index 51307b0fdf0f..03fde694969e 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -27,91 +27,7 @@ config FS_MBCACHE
        default y if EXT4_FS=y && EXT4_FS_XATTR
        default m if EXT2_FS_XATTR || EXT3_FS_XATTR || EXT4_FS_XATTR
-config REISERFS_FS
+source "fs/reiserfs/Kconfig"
-        tristate "Reiserfs support"
-        help
-          Stores not just filenames but the files themselves in a balanced
-          tree.  Uses journalling.
-          Balanced trees are more efficient than traditional file system
-          architectural foundations.
-          In general, ReiserFS is as fast as ext2, but is very efficient with
-          large directories and small files.  Additional patches are needed
-          for NFS and quotas, please see <http://www.namesys.com/> for links.
-          It is more easily extended to have features currently found in
-          database and keyword search systems than block allocation based file
-          systems are.  The next version will be so extended, and will support
-          plugins consistent with our motto ``It takes more than a license to
-          make source code open.''
-          Read <http://www.namesys.com/> to learn more about reiserfs.
-          Sponsored by Threshold Networks, Emusic.com, and Bigstorage.com.
-          If you like it, you can pay us to add new features to it that you
-          need, buy a support contract, or pay us to port it to another OS.
-config REISERFS_CHECK
-        bool "Enable reiserfs debug mode"
-        depends on REISERFS_FS
-        help
-          If you set this to Y, then ReiserFS will perform every check it can
-          possibly imagine of its internal consistency throughout its
-          operation.  It will also go substantially slower.  More than once we
-          have forgotten that this was on, and then gone despondent over the
-          latest benchmarks.:-) Use of this option allows our team to go all
-          out in checking for consistency when debugging without fear of its
-          effect on end users.  If you are on the verge of sending in a bug
-          report, say Y and you might get a useful error message.  Almost
-          everyone should say N.
-config REISERFS_PROC_INFO
-        bool "Stats in /proc/fs/reiserfs"
-        depends on REISERFS_FS && PROC_FS
-        help
-          Create under /proc/fs/reiserfs a hierarchy of files, displaying
-          various ReiserFS statistics and internal data at the expense of
-          making your kernel or module slightly larger (+8 KB). This also
-          increases the amount of kernel memory required for each mount.
-          Almost everyone but ReiserFS developers and people fine-tuning
-          reiserfs or tracing problems should say N.
-config REISERFS_FS_XATTR
-        bool "ReiserFS extended attributes"
-        depends on REISERFS_FS
-        help
-          Extended attributes are name:value pairs associated with inodes by
-          the kernel or by users (see the attr(5) manual page, or visit
-          <http://acl.bestbits.at/> for details).
-          If unsure, say N.
-config REISERFS_FS_POSIX_ACL
-        bool "ReiserFS POSIX Access Control Lists"
-        depends on REISERFS_FS_XATTR
-        select FS_POSIX_ACL
-        help
-          Posix Access Control Lists (ACLs) support permissions for users and
-          groups beyond the owner/group/world scheme.
-          To learn more about Access Control Lists, visit the Posix ACLs for
-          Linux website <http://acl.bestbits.at/>.
-          If you don't know what Access Control Lists are, say N
-config REISERFS_FS_SECURITY
-        bool "ReiserFS Security Labels"
-        depends on REISERFS_FS_XATTR
-        help
-          Security labels support alternative access control models
-          implemented by security modules like SELinux.  This option
-          enables an extended attribute handler for file security
-          labels in the ReiserFS filesystem.
-          If you are not using a security module that requires using
-          extended attributes for file security labels, say N.
 config JFS_FS
        tristate "JFS filesystem support"

diff --git a/fs/Kconfig b/fs/Kconfig index 51307b0fdf0f..03fde694969e 100644 --- a/fs/Kconfig +++ b/fs/Kconfig
@@ -27,91 +27,7 @@ config FS_MBCACHE
27	default y if EXT4_FS=y && EXT4_FS_XATTR	27	default y if EXT4_FS=y && EXT4_FS_XATTR
28	default m if EXT2_FS_XATTR \|\| EXT3_FS_XATTR \|\| EXT4_FS_XATTR	28	default m if EXT2_FS_XATTR \|\| EXT3_FS_XATTR \|\| EXT4_FS_XATTR
29		29
30	config REISERFS_FS	30	source "fs/reiserfs/Kconfig"
31	tristate "Reiserfs support"
32	help
33	Stores not just filenames but the files themselves in a balanced
34	tree. Uses journalling.
35
36	Balanced trees are more efficient than traditional file system
37	architectural foundations.
38
39	In general, ReiserFS is as fast as ext2, but is very efficient with
40	large directories and small files. Additional patches are needed
41	for NFS and quotas, please see <http://www.namesys.com/> for links.
42
43	It is more easily extended to have features currently found in
44	database and keyword search systems than block allocation based file
45	systems are. The next version will be so extended, and will support
46	plugins consistent with our motto ``It takes more than a license to
47	make source code open.''
48
49	Read <http://www.namesys.com/> to learn more about reiserfs.
50
51	Sponsored by Threshold Networks, Emusic.com, and Bigstorage.com.
52
53	If you like it, you can pay us to add new features to it that you
54	need, buy a support contract, or pay us to port it to another OS.
55
56	config REISERFS_CHECK
57	bool "Enable reiserfs debug mode"
58	depends on REISERFS_FS
59	help
60	If you set this to Y, then ReiserFS will perform every check it can
61	possibly imagine of its internal consistency throughout its
62	operation. It will also go substantially slower. More than once we
63	have forgotten that this was on, and then gone despondent over the
64	latest benchmarks.:-) Use of this option allows our team to go all
65	out in checking for consistency when debugging without fear of its
66	effect on end users. If you are on the verge of sending in a bug
67	report, say Y and you might get a useful error message. Almost
68	everyone should say N.
69
70	config REISERFS_PROC_INFO
71	bool "Stats in /proc/fs/reiserfs"
72	depends on REISERFS_FS && PROC_FS
73	help
74	Create under /proc/fs/reiserfs a hierarchy of files, displaying
75	various ReiserFS statistics and internal data at the expense of
76	making your kernel or module slightly larger (+8 KB). This also
77	increases the amount of kernel memory required for each mount.
78	Almost everyone but ReiserFS developers and people fine-tuning
79	reiserfs or tracing problems should say N.
80
81	config REISERFS_FS_XATTR
82	bool "ReiserFS extended attributes"
83	depends on REISERFS_FS
84	help
85	Extended attributes are name:value pairs associated with inodes by
86	the kernel or by users (see the attr(5) manual page, or visit
87	<http://acl.bestbits.at/> for details).
88
89	If unsure, say N.
90
91	config REISERFS_FS_POSIX_ACL
92	bool "ReiserFS POSIX Access Control Lists"
93	depends on REISERFS_FS_XATTR
94	select FS_POSIX_ACL
95	help
96	Posix Access Control Lists (ACLs) support permissions for users and
97	groups beyond the owner/group/world scheme.
98
99	To learn more about Access Control Lists, visit the Posix ACLs for
100	Linux website <http://acl.bestbits.at/>.
101
102	If you don't know what Access Control Lists are, say N
103
104	config REISERFS_FS_SECURITY
105	bool "ReiserFS Security Labels"
106	depends on REISERFS_FS_XATTR
107	help
108	Security labels support alternative access control models
109	implemented by security modules like SELinux. This option
110	enables an extended attribute handler for file security
111	labels in the ReiserFS filesystem.
112
113	If you are not using a security module that requires using
114	extended attributes for file security labels, say N.
115		31
116	config JFS_FS	32	config JFS_FS
117	tristate "JFS filesystem support"	33	tristate "JFS filesystem support"