diff options
author | Steve French <smfrench@gmail.com> | 2012-10-01 13:48:03 -0400 |
---|---|---|
committer | Steve French <smfrench@gmail.com> | 2012-10-01 13:48:03 -0400 |
commit | 1d4ab9077681b7cce60ff46e3a42fe2dafa0b83d (patch) | |
tree | ac6ede6f99d39c833f582509b63064b3f772f51f | |
parent | e4aa25e7801163df058f62c617b859e9d3d4b148 (diff) |
[CIFS] Fix indentation of fs/cifs/Kconfig entries
make menuconfig for cifs shows multiple entries toward
the end of the list with the incorrect indentation
(probably a bug in Kconfig parsing of items
that are dependant on the module (cifs=m instead of
just CONFIG_CIFS). This patch fixes the indentation
of all but the last entry (CIFS_ACL) which I don't
know how to fix. It also clarifies wording in
two places
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <smfrench@gmail.com>
-rw-r--r-- | fs/cifs/Kconfig | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/fs/cifs/Kconfig b/fs/cifs/Kconfig index 253033ec0904..2075ddfffa73 100644 --- a/fs/cifs/Kconfig +++ b/fs/cifs/Kconfig | |||
@@ -15,8 +15,8 @@ config CIFS | |||
15 | (CIFS) protocol which is the successor to the Server Message Block | 15 | (CIFS) protocol which is the successor to the Server Message Block |
16 | (SMB) protocol, the native file sharing mechanism for most early | 16 | (SMB) protocol, the native file sharing mechanism for most early |
17 | PC operating systems. The CIFS protocol is fully supported by | 17 | PC operating systems. The CIFS protocol is fully supported by |
18 | file servers such as Windows 2000 (including Windows 2003, NT 4 | 18 | file servers such as Windows 2000 (including Windows 2003, Windows 2008, |
19 | and Windows XP) as well by Samba (which provides excellent CIFS | 19 | NT 4 and Windows XP) as well by Samba (which provides excellent CIFS |
20 | server support for Linux and many other operating systems). Limited | 20 | server support for Linux and many other operating systems). Limited |
21 | support for OS/2 and Windows ME and similar servers is provided as | 21 | support for OS/2 and Windows ME and similar servers is provided as |
22 | well. | 22 | well. |
@@ -115,6 +115,13 @@ config CIFS_POSIX | |||
115 | (such as Samba 3.10 and later) which can negotiate | 115 | (such as Samba 3.10 and later) which can negotiate |
116 | CIFS POSIX ACL support. If unsure, say N. | 116 | CIFS POSIX ACL support. If unsure, say N. |
117 | 117 | ||
118 | config CIFS_ACL | ||
119 | bool "Provide CIFS ACL support" | ||
120 | depends on CIFS_XATTR && KEYS | ||
121 | help | ||
122 | Allows fetching CIFS/NTFS ACL from the server. The DACL blob | ||
123 | is handed over to the application/caller. | ||
124 | |||
118 | config CIFS_DEBUG2 | 125 | config CIFS_DEBUG2 |
119 | bool "Enable additional CIFS debugging routines" | 126 | bool "Enable additional CIFS debugging routines" |
120 | depends on CIFS | 127 | depends on CIFS |
@@ -139,21 +146,6 @@ config CIFS_DFS_UPCALL | |||
139 | IP addresses) which is needed for implicit mounts of DFS junction | 146 | IP addresses) which is needed for implicit mounts of DFS junction |
140 | points. If unsure, say N. | 147 | points. If unsure, say N. |
141 | 148 | ||
142 | config CIFS_FSCACHE | ||
143 | bool "Provide CIFS client caching support" | ||
144 | depends on CIFS=m && FSCACHE || CIFS=y && FSCACHE=y | ||
145 | help | ||
146 | Makes CIFS FS-Cache capable. Say Y here if you want your CIFS data | ||
147 | to be cached locally on disk through the general filesystem cache | ||
148 | manager. If unsure, say N. | ||
149 | |||
150 | config CIFS_ACL | ||
151 | bool "Provide CIFS ACL support" | ||
152 | depends on CIFS_XATTR && KEYS | ||
153 | help | ||
154 | Allows to fetch CIFS/NTFS ACL from the server. The DACL blob | ||
155 | is handed over to the application/caller. | ||
156 | |||
157 | config CIFS_NFSD_EXPORT | 149 | config CIFS_NFSD_EXPORT |
158 | bool "Allow nfsd to export CIFS file system (EXPERIMENTAL)" | 150 | bool "Allow nfsd to export CIFS file system (EXPERIMENTAL)" |
159 | depends on CIFS && EXPERIMENTAL && BROKEN | 151 | depends on CIFS && EXPERIMENTAL && BROKEN |
@@ -162,7 +154,7 @@ config CIFS_NFSD_EXPORT | |||
162 | 154 | ||
163 | config CIFS_SMB2 | 155 | config CIFS_SMB2 |
164 | bool "SMB2 network file system support (EXPERIMENTAL)" | 156 | bool "SMB2 network file system support (EXPERIMENTAL)" |
165 | depends on EXPERIMENTAL && INET | 157 | depends on CIFS && EXPERIMENTAL && INET |
166 | select NLS | 158 | select NLS |
167 | select KEYS | 159 | select KEYS |
168 | select FSCACHE | 160 | select FSCACHE |
@@ -179,3 +171,12 @@ config CIFS_SMB2 | |||
179 | (compared to cifs) due to protocol improvements. | 171 | (compared to cifs) due to protocol improvements. |
180 | 172 | ||
181 | Unless you are a developer or tester, say N. | 173 | Unless you are a developer or tester, say N. |
174 | |||
175 | config CIFS_FSCACHE | ||
176 | bool "Provide CIFS client caching support" | ||
177 | depends on CIFS=m && FSCACHE || CIFS=y && FSCACHE=y | ||
178 | help | ||
179 | Makes CIFS FS-Cache capable. Say Y here if you want your CIFS data | ||
180 | to be cached locally on disk through the general filesystem cache | ||
181 | manager. If unsure, say N. | ||
182 | |||