[PATCH] fs/Kconfig: more consistent configuration of XFS

aq
2005-04-28T07:57:18Z

[-- Attachment #1: Type: text/plain, Size: 986 bytes --]

hello,

At the moment, the configuration interface of Filesystem is not very consistent:

- All other filesystem configurations (like Reiserfs, JFS, ext3,...)
is in fs/Kconfig, but only XFS is in a separate file fs/xfs/Kconfig
- All other filesystem configuration is processed in the same screen
(using a kind of drop-down interface), but XFS configuration is done
in a separate screen.

Here is the patch to fix the problem: it moves XFS configuration from
fs/xfs/Kconfig to fs/Kconfig, makes it to do all the configuration in
the same screen (by removing "menu" directive), and removes the
unnecessary fs/xfs/Kconfig.

This patch is against 2.6.12-rc3. Please apply.

# diffstat makefile.fs.patch
Kconfig | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
xfs/Kconfig | 85 ------------------------------------------------------------
2 files changed, 81 insertions(+), 86 deletions(-)

Signed-off-by: Nguyen Anh Quynh <aquynh@gmail.com>

[-- Attachment #2: makefile.fs.patch --]
[-- Type: application/octet-stream, Size: 7054 bytes --]

diff -Nurp -X dontdiff-aq a/2.6.12-rc3/fs/Kconfig b/2.6.12-rc3/fs/Kconfig
--- a/2.6.12-rc3/fs/Kconfig 2005-04-28 00:25:54.000000000 +0900
+++ b/2.6.12-rc3/fs/Kconfig 2005-04-28 00:17:59.000000000 +0900
@@ -304,7 +304,87 @@ config FS_POSIX_ACL
depends on EXT2_FS_POSIX_ACL || EXT3_FS_POSIX_ACL || JFS_POSIX_ACL || REISERFS_FS_POSIX_ACL || NFSD_V4
default y

-source "fs/xfs/Kconfig"
+config XFS_FS
+ tristate "XFS filesystem support"
+ select EXPORTFS if NFSD!=n
+ help
+ XFS is a high performance journaling filesystem which originated
+ on the SGI IRIX platform. It is completely multi-threaded, can
+ support large files and large filesystems, extended attributes,
+ variable block sizes, is extent based, and makes extensive use of
+ Btrees (directories, extents, free space) to aid both performance
+ and scalability.
+
+ Refer to the documentation at <http://oss.sgi.com/projects/xfs/>
+ for complete details. This implementation is on-disk compatible
+ with the IRIX version of XFS.
+
+ To compile this file system support as a module, choose M here: the
+ module will be called xfs. Be aware, however, that if the file
+ system of your root partition is compiled as a module, you'll need
+ to use an initial ramdisk (initrd) to boot.
+
+config XFS_RT
+ bool "Realtime support (EXPERIMENTAL)"
+ depends on XFS_FS && EXPERIMENTAL
+ help
+ If you say Y here you will be able to mount and use XFS filesystems
+ which contain a realtime subvolume. The realtime subvolume is a
+ separate area of disk space where only file data is stored. The
+ realtime subvolume is designed to provide very deterministic
+ data rates suitable for media streaming applications.
+
+ See the xfs man page in section 5 for a bit more information.
+
+ This feature is unsupported at this time, is not yet fully
+ functional, and may cause serious problems.
+
+ If unsure, say N.
+
+config XFS_QUOTA
+ bool "Quota support"
+ depends on XFS_FS
+ help
+ If you say Y here, you will be able to set limits for disk usage on
+ a per user and/or a per group basis under XFS. XFS considers quota
+ information as filesystem metadata and uses journaling to provide a
+ higher level guarantee of consistency. The on-disk data format for
+ quota is also compatible with the IRIX version of XFS, allowing a
+ filesystem to be migrated between Linux and IRIX without any need
+ for conversion.
+
+ If unsure, say N. More comprehensive documentation can be found in
+ README.quota in the xfsprogs package. XFS quota can be used either
+ with or without the generic quota support enabled (CONFIG_QUOTA) -
+ they are completely independent subsystems.
+
+config XFS_SECURITY
+ bool "Security Label support"
+ depends on XFS_FS
+ help
+ Security labels support alternative access control models
+ implemented by security modules like SELinux. This option
+ enables an extended attribute namespace for inode security
+ labels in the XFS filesystem.
+
+ If you are not using a security module that requires using
+ extended attributes for inode security labels, say N.
+
+config XFS_POSIX_ACL
+ bool "POSIX ACL support"
+ depends on XFS_FS
+ 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 XFS_EXPORT
+ bool
+ default y if XFS_FS && EXPORTFS

config MINIX_FS
tristate "Minix fs support"
diff -Nurp -X dontdiff-aq a/2.6.12-rc3/fs/xfs/Kconfig b/2.6.12-rc3/fs/xfs/Kconfig
--- a/2.6.12-rc3/fs/xfs/Kconfig 2005-03-02 16:38:08.000000000 +0900
+++ b/2.6.12-rc3/fs/xfs/Kconfig 1970-01-01 09:00:00.000000000 +0900
@@ -1,85 +0,0 @@
-menu "XFS support"
-
-config XFS_FS
- tristate "XFS filesystem support"
- select EXPORTFS if NFSD!=n
- help
- XFS is a high performance journaling filesystem which originated
- on the SGI IRIX platform. It is completely multi-threaded, can
- support large files and large filesystems, extended attributes,
- variable block sizes, is extent based, and makes extensive use of
- Btrees (directories, extents, free space) to aid both performance
- and scalability.
-
- Refer to the documentation at <http://oss.sgi.com/projects/xfs/>
- for complete details. This implementation is on-disk compatible
- with the IRIX version of XFS.
-
- To compile this file system support as a module, choose M here: the
- module will be called xfs. Be aware, however, that if the file
- system of your root partition is compiled as a module, you'll need
- to use an initial ramdisk (initrd) to boot.
-
-config XFS_EXPORT
- bool
- default y if XFS_FS && EXPORTFS
-
-config XFS_RT
- bool "Realtime support (EXPERIMENTAL)"
- depends on XFS_FS && EXPERIMENTAL
- help
- If you say Y here you will be able to mount and use XFS filesystems
- which contain a realtime subvolume. The realtime subvolume is a
- separate area of disk space where only file data is stored. The
- realtime subvolume is designed to provide very deterministic
- data rates suitable for media streaming applications.
-
- See the xfs man page in section 5 for a bit more information.
-
- This feature is unsupported at this time, is not yet fully
- functional, and may cause serious problems.
-
- If unsure, say N.
-
-config XFS_QUOTA
- bool "Quota support"
- depends on XFS_FS
- help
- If you say Y here, you will be able to set limits for disk usage on
- a per user and/or a per group basis under XFS. XFS considers quota
- information as filesystem metadata and uses journaling to provide a
- higher level guarantee of consistency. The on-disk data format for
- quota is also compatible with the IRIX version of XFS, allowing a
- filesystem to be migrated between Linux and IRIX without any need
- for conversion.
-
- If unsure, say N. More comprehensive documentation can be found in
- README.quota in the xfsprogs package. XFS quota can be used either
- with or without the generic quota support enabled (CONFIG_QUOTA) -
- they are completely independent subsystems.
-
-config XFS_SECURITY
- bool "Security Label support"
- depends on XFS_FS
- help
- Security labels support alternative access control models
- implemented by security modules like SELinux. This option
- enables an extended attribute namespace for inode security
- labels in the XFS filesystem.
-
- If you are not using a security module that requires using
- extended attributes for inode security labels, say N.
-
-config XFS_POSIX_ACL
- bool "POSIX ACL support"
- depends on XFS_FS
- 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.
-
-endmenu