Commit 20ba02879bc78cdf1ed89a1c6a92ee55d31ee103
1 parent
f016bad6be
Exists in
master
and in
7 other branches
[XFS] Remove special Kconfig XFS menu, make XFS options "inline".
Signed-off-by: Eric Sandeen <sandeen@sgi.com> Signed-off-by: Nathan Scott <nathans@sgi.com>
Showing 1 changed file with 21 additions and 24 deletions Side-by-side Diff
fs/xfs/Kconfig
| 1 | -menu "XFS support" | |
| 2 | - | |
| 3 | 1 | config XFS_FS |
| 4 | 2 | tristate "XFS filesystem support" |
| 5 | 3 | select EXPORTFS if NFSD!=n |
| 6 | 4 | |
| 7 | 5 | |
| ... | ... | @@ -22,27 +20,11 @@ |
| 22 | 20 | |
| 23 | 21 | config XFS_EXPORT |
| 24 | 22 | bool |
| 25 | - default y if XFS_FS && EXPORTFS | |
| 23 | + depends on XFS_FS && EXPORTFS | |
| 24 | + default y | |
| 26 | 25 | |
| 27 | -config XFS_RT | |
| 28 | - bool "Realtime support (EXPERIMENTAL)" | |
| 29 | - depends on XFS_FS && EXPERIMENTAL | |
| 30 | - help | |
| 31 | - If you say Y here you will be able to mount and use XFS filesystems | |
| 32 | - which contain a realtime subvolume. The realtime subvolume is a | |
| 33 | - separate area of disk space where only file data is stored. The | |
| 34 | - realtime subvolume is designed to provide very deterministic | |
| 35 | - data rates suitable for media streaming applications. | |
| 36 | - | |
| 37 | - See the xfs man page in section 5 for a bit more information. | |
| 38 | - | |
| 39 | - This feature is unsupported at this time, is not yet fully | |
| 40 | - functional, and may cause serious problems. | |
| 41 | - | |
| 42 | - If unsure, say N. | |
| 43 | - | |
| 44 | 26 | config XFS_QUOTA |
| 45 | - bool "Quota support" | |
| 27 | + tristate "XFS Quota support" | |
| 46 | 28 | depends on XFS_FS |
| 47 | 29 | help |
| 48 | 30 | If you say Y here, you will be able to set limits for disk usage on |
| ... | ... | @@ -59,7 +41,7 @@ |
| 59 | 41 | they are completely independent subsystems. |
| 60 | 42 | |
| 61 | 43 | config XFS_SECURITY |
| 62 | - bool "Security Label support" | |
| 44 | + bool "XFS Security Label support" | |
| 63 | 45 | depends on XFS_FS |
| 64 | 46 | help |
| 65 | 47 | Security labels support alternative access control models |
| ... | ... | @@ -71,7 +53,7 @@ |
| 71 | 53 | extended attributes for inode security labels, say N. |
| 72 | 54 | |
| 73 | 55 | config XFS_POSIX_ACL |
| 74 | - bool "POSIX ACL support" | |
| 56 | + bool "XFS POSIX ACL support" | |
| 75 | 57 | depends on XFS_FS |
| 76 | 58 | help |
| 77 | 59 | POSIX Access Control Lists (ACLs) support permissions for users and |
| ... | ... | @@ -82,5 +64,20 @@ |
| 82 | 64 | |
| 83 | 65 | If you don't know what Access Control Lists are, say N. |
| 84 | 66 | |
| 85 | -endmenu | |
| 67 | +config XFS_RT | |
| 68 | + bool "XFS Realtime support (EXPERIMENTAL)" | |
| 69 | + depends on XFS_FS && EXPERIMENTAL | |
| 70 | + help | |
| 71 | + If you say Y here you will be able to mount and use XFS filesystems | |
| 72 | + which contain a realtime subvolume. The realtime subvolume is a | |
| 73 | + separate area of disk space where only file data is stored. The | |
| 74 | + realtime subvolume is designed to provide very deterministic | |
| 75 | + data rates suitable for media streaming applications. | |
| 76 | + | |
| 77 | + See the xfs man page in section 5 for a bit more information. | |
| 78 | + | |
| 79 | + This feature is unsupported at this time, is not yet fully | |
| 80 | + functional, and may cause serious problems. | |
| 81 | + | |
| 82 | + If unsure, say N. |