1 - use "select" instead of "depend"
2 - remove the unused SMB_NLS
3 - remove unneeded "default y" of CONFIG_NLS
4 - revert to postion of nls menu (middle of filessytem menus is strange)
5 - fix "#ifdef CONFIG_NLS" on UDF (should this add new one to Kconfig?)
9 linux-2.6.0-test9-test-hirofumi/fs/Kconfig | 7 ++
10 linux-2.6.0-test9-test-hirofumi/fs/ncpfs/Kconfig | 1
11 linux-2.6.0-test9-test-hirofumi/fs/nls/Kconfig | 60 +++++++++++++++++-----
12 linux-2.6.0-test9-test-hirofumi/fs/nls/nls_base.c | 4 +
13 linux-2.6.0-test9-test-hirofumi/fs/udf/super.c | 8 +-
14 5 files changed, 64 insertions(+), 16 deletions(-)
16 diff -puN fs/Kconfig~nls_module fs/Kconfig
17 --- linux-2.6.0-test9-test/fs/Kconfig~nls_module 2003-10-26 16:19:20.000000000 +0900
18 +++ linux-2.6.0-test9-test-hirofumi/fs/Kconfig 2003-10-26 16:23:17.000000000 +0900
19 @@ -246,6 +246,7 @@ config REISERFS_PROC_INFO
22 tristate "JFS filesystem support"
25 This is a port of IBM's Journaled Filesystem . More information is
26 available in the file Documentation/filesystems/jfs.txt.
27 @@ -485,6 +486,7 @@ config ISO9660_FS
29 bool "Microsoft Joliet CDROM extensions"
33 Joliet is a Microsoft extension for the ISO 9660 CD-ROM file system
34 which allows for long filenames in unicode format (unicode is the
35 @@ -530,6 +532,7 @@ menu "DOS/FAT/NT Filesystems"
38 tristate "DOS FAT fs support"
41 If you want to use one of the FAT-based file systems (the MS-DOS,
42 VFAT (Windows 95) and UMSDOS (used to run Linux on top of an
43 @@ -651,6 +654,7 @@ config UMSDOS_FS
46 tristate "NTFS file system support"
49 NTFS is the file system of Microsoft Windows NT, 2000, XP and 2003.
51 @@ -962,6 +966,7 @@ config HFS_FS
53 tristate "BeOS file systemv(BeFS) support (read only) (EXPERIMENTAL)"
54 depends on EXPERIMENTAL
57 The BeOS File System (BeFS) is the native file system of Be, Inc's
58 BeOS. Notable features include support for arbitrary attributes
59 @@ -1440,6 +1445,7 @@ config RPCSEC_GSS_KRB5
61 tristate "SMB file system support (to mount Windows shares etc.)"
65 SMB (Server Message Block) is the protocol Windows for Workgroups
66 (WfW), Windows 95/98, Windows NT and OS/2 Lan Manager use to share
67 @@ -1495,6 +1501,7 @@ config SMB_NLS_REMOTE
69 tristate "CIFS support (advanced network filesystem for Samba, Window and other CIFS compliant servers)(EXPERIMENTAL)"
73 This is the client VFS module for the Common Internet File System
74 (CIFS) protocol which is the successor to the Server Message Block
75 diff -puN fs/ncpfs/Kconfig~nls_module fs/ncpfs/Kconfig
76 --- linux-2.6.0-test9-test/fs/ncpfs/Kconfig~nls_module 2003-10-26 16:19:20.000000000 +0900
77 +++ linux-2.6.0-test9-test-hirofumi/fs/ncpfs/Kconfig 2003-10-26 16:22:42.000000000 +0900
78 @@ -65,6 +65,7 @@ config NCPFS_SMALLDOS
80 bool "Use Native Language Support"
84 Allows you to use codepages and I/O charsets for file name
85 translation between the server file system and input/output. This
86 diff -puN fs/nls/Kconfig~nls_module fs/nls/Kconfig
87 --- linux-2.6.0-test9-test/fs/nls/Kconfig~nls_module 2003-10-26 16:19:20.000000000 +0900
88 +++ linux-2.6.0-test9-test-hirofumi/fs/nls/Kconfig 2003-10-26 16:36:02.000000000 +0900
91 # Native language support configuration
99 -# msdos and Joliet want NLS
100 +menu "Native Language Support"
104 - depends on JOLIET || FAT_FS || NTFS_FS || NCPFS_NLS || SMB_NLS || JFS_FS || CIFS || BEFS_FS
106 + tristate "Base native language support"
108 + The base Native Language Support. A number of filesystems
109 + depend on it (e.g. FAT, JOLIET, NT, BEOS filesystems), as well
110 + as the ability of some filesystems to use native languages
115 -menu "Native Language Support"
117 + To compile this code as a module, choose M here: the module
118 + will be called nls_base.
121 string "Default NLS Option"
125 The default NLS used when mounting file system. Note, that this is
126 @@ -38,6 +39,7 @@ config NLS_DEFAULT
128 config NLS_CODEPAGE_437
129 tristate "Codepage 437 (United States, Canada)"
132 The Microsoft FAT file system family can deal with filenames in
133 native language character sets. These character sets are stored
134 @@ -50,6 +52,7 @@ config NLS_CODEPAGE_437
136 config NLS_CODEPAGE_737
137 tristate "Codepage 737 (Greek)"
140 The Microsoft FAT file system family can deal with filenames in
141 native language character sets. These character sets are stored
142 @@ -62,6 +65,7 @@ config NLS_CODEPAGE_737
144 config NLS_CODEPAGE_775
145 tristate "Codepage 775 (Baltic Rim)"
148 The Microsoft FAT file system family can deal with filenames in
149 native language character sets. These character sets are stored
150 @@ -75,6 +79,7 @@ config NLS_CODEPAGE_775
152 config NLS_CODEPAGE_850
153 tristate "Codepage 850 (Europe)"
156 The Microsoft FAT file system family can deal with filenames in
157 native language character sets. These character sets are stored in
158 @@ -91,6 +96,7 @@ config NLS_CODEPAGE_850
160 config NLS_CODEPAGE_852
161 tristate "Codepage 852 (Central/Eastern Europe)"
164 The Microsoft FAT file system family can deal with filenames in
165 native language character sets. These character sets are stored in
166 @@ -106,6 +112,7 @@ config NLS_CODEPAGE_852
168 config NLS_CODEPAGE_855
169 tristate "Codepage 855 (Cyrillic)"
172 The Microsoft FAT file system family can deal with filenames in
173 native language character sets. These character sets are stored in
174 @@ -117,6 +124,7 @@ config NLS_CODEPAGE_855
176 config NLS_CODEPAGE_857
177 tristate "Codepage 857 (Turkish)"
180 The Microsoft FAT file system family can deal with filenames in
181 native language character sets. These character sets are stored in
182 @@ -128,6 +136,7 @@ config NLS_CODEPAGE_857
184 config NLS_CODEPAGE_860
185 tristate "Codepage 860 (Portuguese)"
188 The Microsoft FAT file system family can deal with filenames in
189 native language character sets. These character sets are stored in
190 @@ -139,6 +148,7 @@ config NLS_CODEPAGE_860
192 config NLS_CODEPAGE_861
193 tristate "Codepage 861 (Icelandic)"
196 The Microsoft FAT file system family can deal with filenames in
197 native language character sets. These character sets are stored in
198 @@ -150,6 +160,7 @@ config NLS_CODEPAGE_861
200 config NLS_CODEPAGE_862
201 tristate "Codepage 862 (Hebrew)"
204 The Microsoft FAT file system family can deal with filenames in
205 native language character sets. These character sets are stored in
206 @@ -161,6 +172,7 @@ config NLS_CODEPAGE_862
208 config NLS_CODEPAGE_863
209 tristate "Codepage 863 (Canadian French)"
212 The Microsoft FAT file system family can deal with filenames in
213 native language character sets. These character sets are stored in
214 @@ -173,6 +185,7 @@ config NLS_CODEPAGE_863
216 config NLS_CODEPAGE_864
217 tristate "Codepage 864 (Arabic)"
220 The Microsoft FAT file system family can deal with filenames in
221 native language character sets. These character sets are stored in
222 @@ -184,6 +197,7 @@ config NLS_CODEPAGE_864
224 config NLS_CODEPAGE_865
225 tristate "Codepage 865 (Norwegian, Danish)"
228 The Microsoft FAT file system family can deal with filenames in
229 native language character sets. These character sets are stored in
230 @@ -196,6 +210,7 @@ config NLS_CODEPAGE_865
232 config NLS_CODEPAGE_866
233 tristate "Codepage 866 (Cyrillic/Russian)"
236 The Microsoft FAT file system family can deal with filenames in
237 native language character sets. These character sets are stored in
238 @@ -208,6 +223,7 @@ config NLS_CODEPAGE_866
240 config NLS_CODEPAGE_869
241 tristate "Codepage 869 (Greek)"
244 The Microsoft FAT file system family can deal with filenames in
245 native language character sets. These character sets are stored in
246 @@ -219,6 +235,7 @@ config NLS_CODEPAGE_869
248 config NLS_CODEPAGE_936
249 tristate "Simplified Chinese charset (CP936, GB2312)"
252 The Microsoft FAT file system family can deal with filenames in
253 native language character sets. These character sets are stored in
254 @@ -231,6 +248,7 @@ config NLS_CODEPAGE_936
256 config NLS_CODEPAGE_950
257 tristate "Traditional Chinese charset (Big5)"
260 The Microsoft FAT file system family can deal with filenames in
261 native language character sets. These character sets are stored in
262 @@ -243,6 +261,7 @@ config NLS_CODEPAGE_950
264 config NLS_CODEPAGE_932
265 tristate "Japanese charsets (Shift-JIS, EUC-JP)"
268 The Microsoft FAT file system family can deal with filenames in
269 native language character sets. These character sets are stored in
270 @@ -256,6 +275,7 @@ config NLS_CODEPAGE_932
272 config NLS_CODEPAGE_949
273 tristate "Korean charset (CP949, EUC-KR)"
276 The Microsoft FAT file system family can deal with filenames in
277 native language character sets. These character sets are stored in
278 @@ -267,6 +287,7 @@ config NLS_CODEPAGE_949
280 config NLS_CODEPAGE_874
281 tristate "Thai charset (CP874, TIS-620)"
284 The Microsoft FAT file system family can deal with filenames in
285 native language character sets. These character sets are stored in
286 @@ -278,6 +299,7 @@ config NLS_CODEPAGE_874
289 tristate "Hebrew charsets (ISO-8859-8, CP1255)"
292 If you want to display filenames with native language characters
293 from the Microsoft FAT file system family or from JOLIET CD-ROMs
294 @@ -287,6 +309,7 @@ config NLS_ISO8859_8
296 config NLS_CODEPAGE_1250
297 tristate "Windows CP1250 (Slavic/Central European Languages)"
300 If you want to display filenames with native language characters
301 from the Microsoft FAT file system family or from JOLIET CDROMs
302 @@ -298,6 +321,7 @@ config NLS_CODEPAGE_1250
304 config NLS_CODEPAGE_1251
305 tristate "Windows CP1251 (Bulgarian, Belarusian)"
308 The Microsoft FAT file system family can deal with filenames in
309 native language character sets. These character sets are stored in
310 @@ -310,6 +334,7 @@ config NLS_CODEPAGE_1251
313 tristate "NLS ISO 8859-1 (Latin 1; Western European Languages)"
316 If you want to display filenames with native language characters
317 from the Microsoft FAT file system family or from JOLIET CD-ROMs
318 @@ -322,6 +347,7 @@ config NLS_ISO8859_1
321 tristate "NLS ISO 8859-2 (Latin 2; Slavic/Central European Languages)"
324 If you want to display filenames with native language characters
325 from the Microsoft FAT file system family or from JOLIET CD-ROMs
326 @@ -333,6 +359,7 @@ config NLS_ISO8859_2
329 tristate "NLS ISO 8859-3 (Latin 3; Esperanto, Galician, Maltese, Turkish)"
332 If you want to display filenames with native language characters
333 from the Microsoft FAT file system family or from JOLIET CD-ROMs
334 @@ -343,6 +370,7 @@ config NLS_ISO8859_3
337 tristate "NLS ISO 8859-4 (Latin 4; old Baltic charset)"
340 If you want to display filenames with native language characters
341 from the Microsoft FAT file system family or from JOLIET CD-ROMs
342 @@ -353,6 +381,7 @@ config NLS_ISO8859_4
345 tristate "NLS ISO 8859-5 (Cyrillic)"
348 If you want to display filenames with native language characters
349 from the Microsoft FAT file system family or from JOLIET CD-ROMs
350 @@ -364,6 +393,7 @@ config NLS_ISO8859_5
353 tristate "NLS ISO 8859-6 (Arabic)"
356 If you want to display filenames with native language characters
357 from the Microsoft FAT file system family or from JOLIET CD-ROMs
358 @@ -373,6 +403,7 @@ config NLS_ISO8859_6
361 tristate "NLS ISO 8859-7 (Modern Greek)"
364 If you want to display filenames with native language characters
365 from the Microsoft FAT file system family or from JOLIET CD-ROMs
366 @@ -382,6 +413,7 @@ config NLS_ISO8859_7
369 tristate "NLS ISO 8859-9 (Latin 5; Turkish)"
372 If you want to display filenames with native language characters
373 from the Microsoft FAT file system family or from JOLIET CD-ROMs
374 @@ -392,6 +424,7 @@ config NLS_ISO8859_9
376 config NLS_ISO8859_13
377 tristate "NLS ISO 8859-13 (Latin 7; Baltic)"
380 If you want to display filenames with native language characters
381 from the Microsoft FAT file system family or from JOLIET CD-ROMs
382 @@ -402,6 +435,7 @@ config NLS_ISO8859_13
384 config NLS_ISO8859_14
385 tristate "NLS ISO 8859-14 (Latin 8; Celtic)"
388 If you want to display filenames with native language characters
389 from the Microsoft FAT file system family or from JOLIET CD-ROMs
390 @@ -413,6 +447,7 @@ config NLS_ISO8859_14
392 config NLS_ISO8859_15
393 tristate "NLS ISO 8859-15 (Latin 9; Western European Languages with Euro)"
396 If you want to display filenames with native language characters
397 from the Microsoft FAT file system family or from JOLIET CD-ROMs
398 @@ -429,6 +464,7 @@ config NLS_ISO8859_15
401 tristate "NLS KOI8-R (Russian)"
404 If you want to display filenames with native language characters
405 from the Microsoft FAT file system family or from JOLIET CD-ROMs
406 @@ -438,6 +474,7 @@ config NLS_KOI8_R
409 tristate "NLS KOI8-U/RU (Ukrainian, Belarusian)"
412 If you want to display filenames with native language characters
413 from the Microsoft FAT file system family or from JOLIET CD-ROMs
414 @@ -447,6 +484,7 @@ config NLS_KOI8_U
420 If you want to display filenames with native language characters
421 from the Microsoft FAT file system family or from JOLIET CD-ROMs
422 diff -puN fs/nls/nls_base.c~nls_module fs/nls/nls_base.c
423 --- linux-2.6.0-test9-test/fs/nls/nls_base.c~nls_module 2003-10-26 16:19:20.000000000 +0900
424 +++ linux-2.6.0-test9-test-hirofumi/fs/nls/nls_base.c 2003-10-26 16:19:20.000000000 +0900
425 @@ -480,7 +480,7 @@ struct nls_table *load_nls_default(void)
426 if (default_nls != NULL)
429 - return &default_table;
430 + return &default_table;
433 EXPORT_SYMBOL(register_nls);
434 @@ -492,3 +492,5 @@ EXPORT_SYMBOL(utf8_mbtowc);
435 EXPORT_SYMBOL(utf8_mbstowcs);
436 EXPORT_SYMBOL(utf8_wctomb);
437 EXPORT_SYMBOL(utf8_wcstombs);
439 +MODULE_LICENSE("Dual BSD/GPL");
440 diff -puN fs/udf/super.c~nls_module fs/udf/super.c
441 --- linux-2.6.0-test9-test/fs/udf/super.c~nls_module 2003-10-27 00:29:13.000000000 +0900
442 +++ linux-2.6.0-test9-test-hirofumi/fs/udf/super.c 2003-10-27 00:29:13.000000000 +0900
443 @@ -414,7 +414,7 @@ udf_parse_options(char *options, struct
445 uopt->flags |= (1 << UDF_FLAG_UTF8);
448 +#if defined(CONFIG_NLS) || defined(CONFIG_NLS_MODULE)
450 uopt->nls_map = load_nls(args[0].from);
451 uopt->flags |= (1 << UDF_FLAG_NLS_MAP);
452 @@ -1510,7 +1510,7 @@ static int udf_fill_super(struct super_b
453 "utf8 cannot be combined with iocharset\n");
457 +#if defined(CONFIG_NLS) || defined(CONFIG_NLS_MODULE)
458 if ((uopt.flags & (1 << UDF_FLAG_NLS_MAP)) && !uopt.nls_map)
460 uopt.nls_map = load_nls_default();
461 @@ -1674,7 +1674,7 @@ error_out:
462 udf_release_data(UDF_SB_TYPESPAR(sb, UDF_SB_PARTITION(sb)).s_spar_map[i]);
466 +#if defined(CONFIG_NLS) || defined(CONFIG_NLS_MODULE)
467 if (UDF_QUERY_FLAG(sb, UDF_FLAG_NLS_MAP))
468 unload_nls(UDF_SB(sb)->s_nls_map);
470 @@ -1766,7 +1766,7 @@ udf_put_super(struct super_block *sb)
471 udf_release_data(UDF_SB_TYPESPAR(sb, UDF_SB_PARTITION(sb)).s_spar_map[i]);
475 +#if defined(CONFIG_NLS) || defined(CONFIG_NLS_MODULE)
476 if (UDF_QUERY_FLAG(sb, UDF_FLAG_NLS_MAP))
477 unload_nls(UDF_SB(sb)->s_nls_map);