[packages/kernel.git] / 2.6.0-t9-NLS-module-lkml.patch

 - use "select" instead of "depend"
 - remove the unused SMB_NLS
 - remove unneeded "default y" of CONFIG_NLS
 - revert to postion of nls menu (middle of filessytem menus is strange)
 - fix "#ifdef CONFIG_NLS" on UDF (should this add new one to Kconfig?)


 linux-2.6.0-test9-test-hirofumi/fs/Kconfig        |    7 ++
 linux-2.6.0-test9-test-hirofumi/fs/ncpfs/Kconfig  |    1 
 linux-2.6.0-test9-test-hirofumi/fs/nls/Kconfig    |   60 +++++++++++++++++-----
 linux-2.6.0-test9-test-hirofumi/fs/nls/nls_base.c |    4 +
 linux-2.6.0-test9-test-hirofumi/fs/udf/super.c    |    8 +-
 5 files changed, 64 insertions(+), 16 deletions(-)

diff -puN fs/Kconfig~nls_module fs/Kconfig
--- linux-2.6.0-test9-test/fs/Kconfig~nls_module	2003-10-26 16:19:20.000000000 +0900
+++ linux-2.6.0-test9-test-hirofumi/fs/Kconfig	2003-10-26 16:23:17.000000000 +0900
@@ -246,6 +246,7 @@ config REISERFS_PROC_INFO
 
 config JFS_FS
 	tristate "JFS filesystem support"
+	select NLS
 	help
 	  This is a port of IBM's Journaled Filesystem .  More information is
 	  available in the file Documentation/filesystems/jfs.txt.
@@ -485,6 +486,7 @@ config ISO9660_FS
 config JOLIET
 	bool "Microsoft Joliet CDROM extensions"
 	depends on ISO9660_FS
+	select NLS
 	help
 	  Joliet is a Microsoft extension for the ISO 9660 CD-ROM file system
 	  which allows for long filenames in unicode format (unicode is the
@@ -530,6 +532,7 @@ menu "DOS/FAT/NT Filesystems"
 
 config FAT_FS
 	tristate "DOS FAT fs support"
+	select NLS
 	help
 	  If you want to use one of the FAT-based file systems (the MS-DOS,
 	  VFAT (Windows 95) and UMSDOS (used to run Linux on top of an
@@ -651,6 +654,7 @@ config UMSDOS_FS
 
 config NTFS_FS
 	tristate "NTFS file system support"
+	select NLS
 	help
 	  NTFS is the file system of Microsoft Windows NT, 2000, XP and 2003.
 
@@ -962,6 +966,7 @@ config HFS_FS
 config BEFS_FS
 	tristate "BeOS file systemv(BeFS) support (read only) (EXPERIMENTAL)"
 	depends on EXPERIMENTAL
+	select NLS
 	help
 	  The BeOS File System (BeFS) is the native file system of Be, Inc's
 	  BeOS. Notable features include support for arbitrary attributes
@@ -1440,6 +1445,7 @@ config RPCSEC_GSS_KRB5
 config SMB_FS
 	tristate "SMB file system support (to mount Windows shares etc.)"
 	depends on INET
+	select NLS
 	help
 	  SMB (Server Message Block) is the protocol Windows for Workgroups
 	  (WfW), Windows 95/98, Windows NT and OS/2 Lan Manager use to share
@@ -1495,6 +1501,7 @@ config SMB_NLS_REMOTE
 config CIFS
 	tristate "CIFS support (advanced network filesystem for Samba, Window and other CIFS compliant servers)(EXPERIMENTAL)"
 	depends on INET
+	select NLS
 	help
 	  This is the client VFS module for the Common Internet File System
 	  (CIFS) protocol which is the successor to the Server Message Block 
diff -puN fs/ncpfs/Kconfig~nls_module fs/ncpfs/Kconfig
--- linux-2.6.0-test9-test/fs/ncpfs/Kconfig~nls_module	2003-10-26 16:19:20.000000000 +0900
+++ linux-2.6.0-test9-test-hirofumi/fs/ncpfs/Kconfig	2003-10-26 16:22:42.000000000 +0900
@@ -65,6 +65,7 @@ config NCPFS_SMALLDOS
 config NCPFS_NLS
 	bool "Use Native Language Support"
 	depends on NCP_FS
+	select NLS
 	help
 	  Allows you to use codepages and I/O charsets for file name
 	  translation between the server file system and input/output. This
diff -puN fs/nls/Kconfig~nls_module fs/nls/Kconfig
--- linux-2.6.0-test9-test/fs/nls/Kconfig~nls_module	2003-10-26 16:19:20.000000000 +0900
+++ linux-2.6.0-test9-test-hirofumi/fs/nls/Kconfig	2003-10-26 16:36:02.000000000 +0900
@@ -1,24 +1,25 @@
 #
 # Native language support configuration
 #
-# smb wants NLS
-config SMB_NLS
-	bool
-	depends on SMB_FS
-	default y
 
-# msdos and Joliet want NLS
+menu "Native Language Support"
+
 config NLS
-	bool
-	depends on JOLIET || FAT_FS || NTFS_FS || NCPFS_NLS || SMB_NLS || JFS_FS || CIFS || BEFS_FS
-	default y
+	tristate "Base native language support"
+	---help---
+	  The base Native Language Support. A number of filesystems
+	  depend on it (e.g. FAT, JOLIET, NT, BEOS filesystems), as well
+	  as the ability of some filesystems to use native languages
+	  (NCP, SMB).
 
+	  If unsure, say Y.
 
-menu "Native Language Support"
-	depends on NLS
+	  To compile this code as a module, choose M here: the module
+	  will be called nls_base.
 
 config NLS_DEFAULT
 	string "Default NLS Option"
+	depends on NLS
 	default "iso8859-1"
 	---help---
 	  The default NLS used when mounting file system. Note, that this is
@@ -38,6 +39,7 @@ config NLS_DEFAULT
 
 config NLS_CODEPAGE_437
 	tristate "Codepage 437 (United States, Canada)"
+	depends on NLS
 	help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored
@@ -50,6 +52,7 @@ config NLS_CODEPAGE_437
 
 config NLS_CODEPAGE_737
 	tristate "Codepage 737 (Greek)"
+	depends on NLS
 	help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored
@@ -62,6 +65,7 @@ config NLS_CODEPAGE_737
 
 config NLS_CODEPAGE_775
 	tristate "Codepage 775 (Baltic Rim)"
+	depends on NLS
 	help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored
@@ -75,6 +79,7 @@ config NLS_CODEPAGE_775
 
 config NLS_CODEPAGE_850
 	tristate "Codepage 850 (Europe)"
+	depends on NLS
 	---help---
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored in
@@ -91,6 +96,7 @@ config NLS_CODEPAGE_850
 
 config NLS_CODEPAGE_852
 	tristate "Codepage 852 (Central/Eastern Europe)"
+	depends on NLS
 	---help---
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored in
@@ -106,6 +112,7 @@ config NLS_CODEPAGE_852
 
 config NLS_CODEPAGE_855
 	tristate "Codepage 855 (Cyrillic)"
+	depends on NLS
 	help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored in
@@ -117,6 +124,7 @@ config NLS_CODEPAGE_855
 
 config NLS_CODEPAGE_857
 	tristate "Codepage 857 (Turkish)"
+	depends on NLS
 	help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored in
@@ -128,6 +136,7 @@ config NLS_CODEPAGE_857
 
 config NLS_CODEPAGE_860
 	tristate "Codepage 860 (Portuguese)"
+	depends on NLS
 	help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored in
@@ -139,6 +148,7 @@ config NLS_CODEPAGE_860
 
 config NLS_CODEPAGE_861
 	tristate "Codepage 861 (Icelandic)"
+	depends on NLS
 	help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored in
@@ -150,6 +160,7 @@ config NLS_CODEPAGE_861
 
 config NLS_CODEPAGE_862
 	tristate "Codepage 862 (Hebrew)"
+	depends on NLS
 	help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored in
@@ -161,6 +172,7 @@ config NLS_CODEPAGE_862
 
 config NLS_CODEPAGE_863
 	tristate "Codepage 863 (Canadian French)"
+	depends on NLS
 	help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored in
@@ -173,6 +185,7 @@ config NLS_CODEPAGE_863
 
 config NLS_CODEPAGE_864
 	tristate "Codepage 864 (Arabic)"
+	depends on NLS
 	help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored in
@@ -184,6 +197,7 @@ config NLS_CODEPAGE_864
 
 config NLS_CODEPAGE_865
 	tristate "Codepage 865 (Norwegian, Danish)"
+	depends on NLS
 	help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored in
@@ -196,6 +210,7 @@ config NLS_CODEPAGE_865
 
 config NLS_CODEPAGE_866
 	tristate "Codepage 866 (Cyrillic/Russian)"
+	depends on NLS
 	help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored in
@@ -208,6 +223,7 @@ config NLS_CODEPAGE_866
 
 config NLS_CODEPAGE_869
 	tristate "Codepage 869 (Greek)"
+	depends on NLS
 	help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored in
@@ -219,6 +235,7 @@ config NLS_CODEPAGE_869
 
 config NLS_CODEPAGE_936
 	tristate "Simplified Chinese charset (CP936, GB2312)"
+	depends on NLS
 	help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored in
@@ -231,6 +248,7 @@ config NLS_CODEPAGE_936
 
 config NLS_CODEPAGE_950
 	tristate "Traditional Chinese charset (Big5)"
+	depends on NLS
 	help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored in
@@ -243,6 +261,7 @@ config NLS_CODEPAGE_950
 
 config NLS_CODEPAGE_932
 	tristate "Japanese charsets (Shift-JIS, EUC-JP)"
+	depends on NLS
 	help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored in
@@ -256,6 +275,7 @@ config NLS_CODEPAGE_932
 
 config NLS_CODEPAGE_949
 	tristate "Korean charset (CP949, EUC-KR)"
+	depends on NLS
 	help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored in
@@ -267,6 +287,7 @@ config NLS_CODEPAGE_949
 
 config NLS_CODEPAGE_874
 	tristate "Thai charset (CP874, TIS-620)"
+	depends on NLS
 	help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored in
@@ -278,6 +299,7 @@ config NLS_CODEPAGE_874
 
 config NLS_ISO8859_8
 	tristate "Hebrew charsets (ISO-8859-8, CP1255)"
+	depends on NLS
 	help
 	  If you want to display filenames with native language characters
 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -287,6 +309,7 @@ config NLS_ISO8859_8
 
 config NLS_CODEPAGE_1250
 	tristate "Windows CP1250 (Slavic/Central European Languages)"
+	depends on NLS
 	help
 	  If you want to display filenames with native language characters
 	  from the Microsoft FAT file system family or from JOLIET CDROMs
@@ -298,6 +321,7 @@ config NLS_CODEPAGE_1250
 
 config NLS_CODEPAGE_1251
 	tristate "Windows CP1251 (Bulgarian, Belarusian)"
+	depends on NLS
 	help
 	  The Microsoft FAT file system family can deal with filenames in
 	  native language character sets. These character sets are stored in
@@ -310,6 +334,7 @@ config NLS_CODEPAGE_1251
 
 config NLS_ISO8859_1
 	tristate "NLS ISO 8859-1  (Latin 1; Western European Languages)"
+	depends on NLS
 	help
 	  If you want to display filenames with native language characters
 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -322,6 +347,7 @@ config NLS_ISO8859_1
 
 config NLS_ISO8859_2
 	tristate "NLS ISO 8859-2  (Latin 2; Slavic/Central European Languages)"
+	depends on NLS
 	help
 	  If you want to display filenames with native language characters
 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -333,6 +359,7 @@ config NLS_ISO8859_2
 
 config NLS_ISO8859_3
 	tristate "NLS ISO 8859-3  (Latin 3; Esperanto, Galician, Maltese, Turkish)"
+	depends on NLS
 	help
 	  If you want to display filenames with native language characters
 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -343,6 +370,7 @@ config NLS_ISO8859_3
 
 config NLS_ISO8859_4
 	tristate "NLS ISO 8859-4  (Latin 4; old Baltic charset)"
+	depends on NLS
 	help
 	  If you want to display filenames with native language characters
 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -353,6 +381,7 @@ config NLS_ISO8859_4
 
 config NLS_ISO8859_5
 	tristate "NLS ISO 8859-5  (Cyrillic)"
+	depends on NLS
 	help
 	  If you want to display filenames with native language characters
 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -364,6 +393,7 @@ config NLS_ISO8859_5
 
 config NLS_ISO8859_6
 	tristate "NLS ISO 8859-6  (Arabic)"
+	depends on NLS
 	help
 	  If you want to display filenames with native language characters
 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -373,6 +403,7 @@ config NLS_ISO8859_6
 
 config NLS_ISO8859_7
 	tristate "NLS ISO 8859-7  (Modern Greek)"
+	depends on NLS
 	help
 	  If you want to display filenames with native language characters
 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -382,6 +413,7 @@ config NLS_ISO8859_7
 
 config NLS_ISO8859_9
 	tristate "NLS ISO 8859-9  (Latin 5; Turkish)"
+	depends on NLS
 	help
 	  If you want to display filenames with native language characters
 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -392,6 +424,7 @@ config NLS_ISO8859_9
 
 config NLS_ISO8859_13
 	tristate "NLS ISO 8859-13 (Latin 7; Baltic)"
+	depends on NLS
 	help
 	  If you want to display filenames with native language characters
 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -402,6 +435,7 @@ config NLS_ISO8859_13
 
 config NLS_ISO8859_14
 	tristate "NLS ISO 8859-14 (Latin 8; Celtic)"
+	depends on NLS
 	help
 	  If you want to display filenames with native language characters
 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -413,6 +447,7 @@ config NLS_ISO8859_14
 
 config NLS_ISO8859_15
 	tristate "NLS ISO 8859-15 (Latin 9; Western European Languages with Euro)"
+	depends on NLS
 	---help---
 	  If you want to display filenames with native language characters
 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -429,6 +464,7 @@ config NLS_ISO8859_15
 
 config NLS_KOI8_R
 	tristate "NLS KOI8-R (Russian)"
+	depends on NLS
 	help
 	  If you want to display filenames with native language characters
 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -438,6 +474,7 @@ config NLS_KOI8_R
 
 config NLS_KOI8_U
 	tristate "NLS KOI8-U/RU (Ukrainian, Belarusian)"
+	depends on NLS
 	help
 	  If you want to display filenames with native language characters
 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
@@ -447,6 +484,7 @@ config NLS_KOI8_U
 
 config NLS_UTF8
 	tristate "NLS UTF8"
+	depends on NLS
 	help
 	  If you want to display filenames with native language characters
 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
diff -puN fs/nls/nls_base.c~nls_module fs/nls/nls_base.c
--- linux-2.6.0-test9-test/fs/nls/nls_base.c~nls_module	2003-10-26 16:19:20.000000000 +0900
+++ linux-2.6.0-test9-test-hirofumi/fs/nls/nls_base.c	2003-10-26 16:19:20.000000000 +0900
@@ -480,7 +480,7 @@ struct nls_table *load_nls_default(void)
 	if (default_nls != NULL)
 		return default_nls;
 	else
-               return &default_table;
+		return &default_table;
 }
 
 EXPORT_SYMBOL(register_nls);
@@ -492,3 +492,5 @@ EXPORT_SYMBOL(utf8_mbtowc);
 EXPORT_SYMBOL(utf8_mbstowcs);
 EXPORT_SYMBOL(utf8_wctomb);
 EXPORT_SYMBOL(utf8_wcstombs);
+
+MODULE_LICENSE("Dual BSD/GPL");
diff -puN fs/udf/super.c~nls_module fs/udf/super.c
--- linux-2.6.0-test9-test/fs/udf/super.c~nls_module	2003-10-27 00:29:13.000000000 +0900
+++ linux-2.6.0-test9-test-hirofumi/fs/udf/super.c	2003-10-27 00:29:13.000000000 +0900
@@ -414,7 +414,7 @@ udf_parse_options(char *options, struct 
 		case Opt_utf8:
 			uopt->flags |= (1 << UDF_FLAG_UTF8);
 			break;
-#ifdef CONFIG_NLS
+#if defined(CONFIG_NLS) || defined(CONFIG_NLS_MODULE)
 		case Opt_iocharset:
 			uopt->nls_map = load_nls(args[0].from);
 			uopt->flags |= (1 << UDF_FLAG_NLS_MAP);
@@ -1510,7 +1510,7 @@ static int udf_fill_super(struct super_b
 			"utf8 cannot be combined with iocharset\n");
 		goto error_out;
 	}
-#ifdef CONFIG_NLS
+#if defined(CONFIG_NLS) || defined(CONFIG_NLS_MODULE)
 	if ((uopt.flags & (1 << UDF_FLAG_NLS_MAP)) && !uopt.nls_map)
 	{
 		uopt.nls_map = load_nls_default();
@@ -1674,7 +1674,7 @@ error_out:
 				udf_release_data(UDF_SB_TYPESPAR(sb, UDF_SB_PARTITION(sb)).s_spar_map[i]);
 		}
 	}
-#ifdef CONFIG_NLS
+#if defined(CONFIG_NLS) || defined(CONFIG_NLS_MODULE)
 	if (UDF_QUERY_FLAG(sb, UDF_FLAG_NLS_MAP))
 		unload_nls(UDF_SB(sb)->s_nls_map);
 #endif
@@ -1766,7 +1766,7 @@ udf_put_super(struct super_block *sb)
 				udf_release_data(UDF_SB_TYPESPAR(sb, UDF_SB_PARTITION(sb)).s_spar_map[i]);
 		}
 	}
-#ifdef CONFIG_NLS
+#if defined(CONFIG_NLS) || defined(CONFIG_NLS_MODULE)
 	if (UDF_QUERY_FLAG(sb, UDF_FLAG_NLS_MAP))
 		unload_nls(UDF_SB(sb)->s_nls_map);
 #endif
Commit	Line	Data
48910f33	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?)
	6
	7
	8
	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(-)
	15
	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
	20
5de4fc43	21	config JFS_FS
5de4fc43	22	tristate "JFS filesystem support"
48910f33	23	+ select NLS
5de4fc43	24	help
	25	This is a port of IBM's Journaled Filesystem . More information is
	26	available in the file Documentation/filesystems/jfs.txt.
48910f33	27	@@ -485,6 +486,7 @@ config ISO9660_FS
5de4fc43	28	config JOLIET
5de4fc43	29	bool "Microsoft Joliet CDROM extensions"
48910f33	30	depends on ISO9660_FS
48910f33	31	+ select NLS
5de4fc43	32	help
	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
48910f33	35	@@ -530,6 +532,7 @@ menu "DOS/FAT/NT Filesystems"
48910f33	36
5de4fc43	37	config FAT_FS
5de4fc43	38	tristate "DOS FAT fs support"
48910f33	39	+ select NLS
5de4fc43	40	help
	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
48910f33	43	@@ -651,6 +654,7 @@ config UMSDOS_FS
48910f33	44
5de4fc43	45	config NTFS_FS
5de4fc43	46	tristate "NTFS file system support"
48910f33	47	+ select NLS
5de4fc43	48	help
5de4fc43	49	NTFS is the file system of Microsoft Windows NT, 2000, XP and 2003.
48910f33	50
48910f33	51	@@ -962,6 +966,7 @@ config HFS_FS
5de4fc43	52	config BEFS_FS
5de4fc43	53	tristate "BeOS file systemv(BeFS) support (read only) (EXPERIMENTAL)"
48910f33	54	depends on EXPERIMENTAL
48910f33	55	+ select NLS
5de4fc43	56	help
	57	The BeOS File System (BeFS) is the native file system of Be, Inc's
	58	BeOS. Notable features include support for arbitrary attributes
48910f33	59	@@ -1440,6 +1445,7 @@ config RPCSEC_GSS_KRB5
5de4fc43	60	config SMB_FS
5de4fc43	61	tristate "SMB file system support (to mount Windows shares etc.)"
48910f33	62	depends on INET
48910f33	63	+ select NLS
5de4fc43	64	help
	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
48910f33	67	@@ -1495,6 +1501,7 @@ config SMB_NLS_REMOTE
5de4fc43	68	config CIFS
5de4fc43	69	tristate "CIFS support (advanced network filesystem for Samba, Window and other CIFS compliant servers)(EXPERIMENTAL)"
48910f33	70	depends on INET
48910f33	71	+ select NLS
5de4fc43	72	help
5de4fc43	73	This is the client VFS module for the Common Internet File System
48910f33	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
5de4fc43	79	config NCPFS_NLS
5de4fc43	80	bool "Use Native Language Support"
48910f33	81	depends on NCP_FS
48910f33	82	+ select NLS
5de4fc43	83	help
	84	Allows you to use codepages and I/O charsets for file name
	85	translation between the server file system and input/output. This
48910f33	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
	89	@@ -1,24 +1,25 @@
5de4fc43	90	#
	91	# Native language support configuration
	92	#
	93	-# smb wants NLS
	94	-config SMB_NLS
	95	- bool
	96	- depends on SMB_FS
	97	- default y
48910f33	98
5de4fc43	99	-# msdos and Joliet want NLS
	100	+menu "Native Language Support"
	101	+
	102	config NLS
	103	- bool
	104	- depends on JOLIET \|\| FAT_FS \|\| NTFS_FS \|\| NCPFS_NLS \|\| SMB_NLS \|\| JFS_FS \|\| CIFS \|\| BEFS_FS
48910f33	105	- default y
48910f33	106	+ tristate "Base native language support"
5de4fc43	107	+ ---help---
	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
	111	+ (NCP, SMB).
48910f33	112
5de4fc43	113	+ If unsure, say Y.
48910f33	114
5de4fc43	115	-menu "Native Language Support"
	116	- depends on NLS
	117	+ To compile this code as a module, choose M here: the module
	118	+ will be called nls_base.
48910f33	119
5de4fc43	120	config NLS_DEFAULT
	121	string "Default NLS Option"
	122	+ depends on NLS
	123	default "iso8859-1"
	124	---help---
	125	The default NLS used when mounting file system. Note, that this is
48910f33	126	@@ -38,6 +39,7 @@ config NLS_DEFAULT
48910f33	127
5de4fc43	128	config NLS_CODEPAGE_437
	129	tristate "Codepage 437 (United States, Canada)"
	130	+ depends on NLS
	131	help
	132	The Microsoft FAT file system family can deal with filenames in
	133	native language character sets. These character sets are stored
48910f33	134	@@ -50,6 +52,7 @@ config NLS_CODEPAGE_437
48910f33	135
5de4fc43	136	config NLS_CODEPAGE_737
	137	tristate "Codepage 737 (Greek)"
	138	+ depends on NLS
	139	help
	140	The Microsoft FAT file system family can deal with filenames in
	141	native language character sets. These character sets are stored
48910f33	142	@@ -62,6 +65,7 @@ config NLS_CODEPAGE_737
48910f33	143
5de4fc43	144	config NLS_CODEPAGE_775
	145	tristate "Codepage 775 (Baltic Rim)"
	146	+ depends on NLS
	147	help
	148	The Microsoft FAT file system family can deal with filenames in
	149	native language character sets. These character sets are stored
48910f33	150	@@ -75,6 +79,7 @@ config NLS_CODEPAGE_775
48910f33	151
5de4fc43	152	config NLS_CODEPAGE_850
	153	tristate "Codepage 850 (Europe)"
	154	+ depends on NLS
	155	---help---
	156	The Microsoft FAT file system family can deal with filenames in
	157	native language character sets. These character sets are stored in
48910f33	158	@@ -91,6 +96,7 @@ config NLS_CODEPAGE_850
48910f33	159
5de4fc43	160	config NLS_CODEPAGE_852
	161	tristate "Codepage 852 (Central/Eastern Europe)"
	162	+ depends on NLS
	163	---help---
	164	The Microsoft FAT file system family can deal with filenames in
	165	native language character sets. These character sets are stored in
48910f33	166	@@ -106,6 +112,7 @@ config NLS_CODEPAGE_852
48910f33	167
5de4fc43	168	config NLS_CODEPAGE_855
	169	tristate "Codepage 855 (Cyrillic)"
	170	+ depends on NLS
	171	help
	172	The Microsoft FAT file system family can deal with filenames in
	173	native language character sets. These character sets are stored in
48910f33	174	@@ -117,6 +124,7 @@ config NLS_CODEPAGE_855
48910f33	175
5de4fc43	176	config NLS_CODEPAGE_857
	177	tristate "Codepage 857 (Turkish)"
	178	+ depends on NLS
	179	help
	180	The Microsoft FAT file system family can deal with filenames in
	181	native language character sets. These character sets are stored in
48910f33	182	@@ -128,6 +136,7 @@ config NLS_CODEPAGE_857
48910f33	183
5de4fc43	184	config NLS_CODEPAGE_860
	185	tristate "Codepage 860 (Portuguese)"
	186	+ depends on NLS
	187	help
	188	The Microsoft FAT file system family can deal with filenames in
	189	native language character sets. These character sets are stored in
48910f33	190	@@ -139,6 +148,7 @@ config NLS_CODEPAGE_860
48910f33	191
5de4fc43	192	config NLS_CODEPAGE_861
	193	tristate "Codepage 861 (Icelandic)"
	194	+ depends on NLS
	195	help
	196	The Microsoft FAT file system family can deal with filenames in
	197	native language character sets. These character sets are stored in
48910f33	198	@@ -150,6 +160,7 @@ config NLS_CODEPAGE_861
48910f33	199
5de4fc43	200	config NLS_CODEPAGE_862
	201	tristate "Codepage 862 (Hebrew)"
	202	+ depends on NLS
	203	help
	204	The Microsoft FAT file system family can deal with filenames in
	205	native language character sets. These character sets are stored in
48910f33	206	@@ -161,6 +172,7 @@ config NLS_CODEPAGE_862
48910f33	207
5de4fc43	208	config NLS_CODEPAGE_863
	209	tristate "Codepage 863 (Canadian French)"
	210	+ depends on NLS
	211	help
	212	The Microsoft FAT file system family can deal with filenames in
	213	native language character sets. These character sets are stored in
48910f33	214	@@ -173,6 +185,7 @@ config NLS_CODEPAGE_863
48910f33	215
5de4fc43	216	config NLS_CODEPAGE_864
	217	tristate "Codepage 864 (Arabic)"
	218	+ depends on NLS
	219	help
	220	The Microsoft FAT file system family can deal with filenames in
	221	native language character sets. These character sets are stored in
48910f33	222	@@ -184,6 +197,7 @@ config NLS_CODEPAGE_864
48910f33	223
5de4fc43	224	config NLS_CODEPAGE_865
	225	tristate "Codepage 865 (Norwegian, Danish)"
	226	+ depends on NLS
	227	help
	228	The Microsoft FAT file system family can deal with filenames in
	229	native language character sets. These character sets are stored in
48910f33	230	@@ -196,6 +210,7 @@ config NLS_CODEPAGE_865
48910f33	231
5de4fc43	232	config NLS_CODEPAGE_866
	233	tristate "Codepage 866 (Cyrillic/Russian)"
	234	+ depends on NLS
	235	help
	236	The Microsoft FAT file system family can deal with filenames in
	237	native language character sets. These character sets are stored in
48910f33	238	@@ -208,6 +223,7 @@ config NLS_CODEPAGE_866
48910f33	239
5de4fc43	240	config NLS_CODEPAGE_869
	241	tristate "Codepage 869 (Greek)"
	242	+ depends on NLS
	243	help
	244	The Microsoft FAT file system family can deal with filenames in
	245	native language character sets. These character sets are stored in
48910f33	246	@@ -219,6 +235,7 @@ config NLS_CODEPAGE_869
48910f33	247
5de4fc43	248	config NLS_CODEPAGE_936
	249	tristate "Simplified Chinese charset (CP936, GB2312)"
	250	+ depends on NLS
	251	help
	252	The Microsoft FAT file system family can deal with filenames in
	253	native language character sets. These character sets are stored in
48910f33	254	@@ -231,6 +248,7 @@ config NLS_CODEPAGE_936
48910f33	255
5de4fc43	256	config NLS_CODEPAGE_950
	257	tristate "Traditional Chinese charset (Big5)"
	258	+ depends on NLS
	259	help
	260	The Microsoft FAT file system family can deal with filenames in
	261	native language character sets. These character sets are stored in
48910f33	262	@@ -243,6 +261,7 @@ config NLS_CODEPAGE_950
48910f33	263
5de4fc43	264	config NLS_CODEPAGE_932
	265	tristate "Japanese charsets (Shift-JIS, EUC-JP)"
	266	+ depends on NLS
	267	help
	268	The Microsoft FAT file system family can deal with filenames in
	269	native language character sets. These character sets are stored in
48910f33	270	@@ -256,6 +275,7 @@ config NLS_CODEPAGE_932
48910f33	271
5de4fc43	272	config NLS_CODEPAGE_949
	273	tristate "Korean charset (CP949, EUC-KR)"
	274	+ depends on NLS
	275	help
	276	The Microsoft FAT file system family can deal with filenames in
	277	native language character sets. These character sets are stored in
48910f33	278	@@ -267,6 +287,7 @@ config NLS_CODEPAGE_949
48910f33	279
5de4fc43	280	config NLS_CODEPAGE_874
	281	tristate "Thai charset (CP874, TIS-620)"
	282	+ depends on NLS
	283	help
	284	The Microsoft FAT file system family can deal with filenames in
	285	native language character sets. These character sets are stored in
48910f33	286	@@ -278,6 +299,7 @@ config NLS_CODEPAGE_874
48910f33	287
5de4fc43	288	config NLS_ISO8859_8
	289	tristate "Hebrew charsets (ISO-8859-8, CP1255)"
	290	+ depends on NLS
	291	help
	292	If you want to display filenames with native language characters
	293	from the Microsoft FAT file system family or from JOLIET CD-ROMs
48910f33	294	@@ -287,6 +309,7 @@ config NLS_ISO8859_8
48910f33	295
5de4fc43	296	config NLS_CODEPAGE_1250
	297	tristate "Windows CP1250 (Slavic/Central European Languages)"
	298	+ depends on NLS
	299	help
	300	If you want to display filenames with native language characters
	301	from the Microsoft FAT file system family or from JOLIET CDROMs
48910f33	302	@@ -298,6 +321,7 @@ config NLS_CODEPAGE_1250
48910f33	303
5de4fc43	304	config NLS_CODEPAGE_1251
	305	tristate "Windows CP1251 (Bulgarian, Belarusian)"
	306	+ depends on NLS
	307	help
	308	The Microsoft FAT file system family can deal with filenames in
	309	native language character sets. These character sets are stored in
48910f33	310	@@ -310,6 +334,7 @@ config NLS_CODEPAGE_1251
48910f33	311
5de4fc43	312	config NLS_ISO8859_1
	313	tristate "NLS ISO 8859-1 (Latin 1; Western European Languages)"
	314	+ depends on NLS
	315	help
	316	If you want to display filenames with native language characters
	317	from the Microsoft FAT file system family or from JOLIET CD-ROMs
48910f33	318	@@ -322,6 +347,7 @@ config NLS_ISO8859_1
48910f33	319
5de4fc43	320	config NLS_ISO8859_2
	321	tristate "NLS ISO 8859-2 (Latin 2; Slavic/Central European Languages)"
	322	+ depends on NLS
	323	help
	324	If you want to display filenames with native language characters
	325	from the Microsoft FAT file system family or from JOLIET CD-ROMs
48910f33	326	@@ -333,6 +359,7 @@ config NLS_ISO8859_2
48910f33	327
5de4fc43	328	config NLS_ISO8859_3
	329	tristate "NLS ISO 8859-3 (Latin 3; Esperanto, Galician, Maltese, Turkish)"
	330	+ depends on NLS
	331	help
	332	If you want to display filenames with native language characters
	333	from the Microsoft FAT file system family or from JOLIET CD-ROMs
48910f33	334	@@ -343,6 +370,7 @@ config NLS_ISO8859_3
48910f33	335
5de4fc43	336	config NLS_ISO8859_4
	337	tristate "NLS ISO 8859-4 (Latin 4; old Baltic charset)"
	338	+ depends on NLS
	339	help
	340	If you want to display filenames with native language characters
	341	from the Microsoft FAT file system family or from JOLIET CD-ROMs
48910f33	342	@@ -353,6 +381,7 @@ config NLS_ISO8859_4
48910f33	343
5de4fc43	344	config NLS_ISO8859_5
	345	tristate "NLS ISO 8859-5 (Cyrillic)"
	346	+ depends on NLS
	347	help
	348	If you want to display filenames with native language characters
	349	from the Microsoft FAT file system family or from JOLIET CD-ROMs
48910f33	350	@@ -364,6 +393,7 @@ config NLS_ISO8859_5
48910f33	351
5de4fc43	352	config NLS_ISO8859_6
	353	tristate "NLS ISO 8859-6 (Arabic)"
	354	+ depends on NLS
	355	help
	356	If you want to display filenames with native language characters
	357	from the Microsoft FAT file system family or from JOLIET CD-ROMs
48910f33	358	@@ -373,6 +403,7 @@ config NLS_ISO8859_6
48910f33	359
5de4fc43	360	config NLS_ISO8859_7
	361	tristate "NLS ISO 8859-7 (Modern Greek)"
	362	+ depends on NLS
	363	help
	364	If you want to display filenames with native language characters
	365	from the Microsoft FAT file system family or from JOLIET CD-ROMs
48910f33	366	@@ -382,6 +413,7 @@ config NLS_ISO8859_7
48910f33	367
5de4fc43	368	config NLS_ISO8859_9
	369	tristate "NLS ISO 8859-9 (Latin 5; Turkish)"
	370	+ depends on NLS
	371	help
	372	If you want to display filenames with native language characters
	373	from the Microsoft FAT file system family or from JOLIET CD-ROMs
48910f33	374	@@ -392,6 +424,7 @@ config NLS_ISO8859_9
48910f33	375
5de4fc43	376	config NLS_ISO8859_13
	377	tristate "NLS ISO 8859-13 (Latin 7; Baltic)"
	378	+ depends on NLS
	379	help
	380	If you want to display filenames with native language characters
	381	from the Microsoft FAT file system family or from JOLIET CD-ROMs
48910f33	382	@@ -402,6 +435,7 @@ config NLS_ISO8859_13
48910f33	383
5de4fc43	384	config NLS_ISO8859_14
	385	tristate "NLS ISO 8859-14 (Latin 8; Celtic)"
	386	+ depends on NLS
	387	help
	388	If you want to display filenames with native language characters
	389	from the Microsoft FAT file system family or from JOLIET CD-ROMs
48910f33	390	@@ -413,6 +447,7 @@ config NLS_ISO8859_14
48910f33	391
5de4fc43	392	config NLS_ISO8859_15
	393	tristate "NLS ISO 8859-15 (Latin 9; Western European Languages with Euro)"
	394	+ depends on NLS
	395	---help---
	396	If you want to display filenames with native language characters
	397	from the Microsoft FAT file system family or from JOLIET CD-ROMs
48910f33	398	@@ -429,6 +464,7 @@ config NLS_ISO8859_15
48910f33	399
5de4fc43	400	config NLS_KOI8_R
	401	tristate "NLS KOI8-R (Russian)"
	402	+ depends on NLS
	403	help
	404	If you want to display filenames with native language characters
	405	from the Microsoft FAT file system family or from JOLIET CD-ROMs
48910f33	406	@@ -438,6 +474,7 @@ config NLS_KOI8_R
48910f33	407
5de4fc43	408	config NLS_KOI8_U
	409	tristate "NLS KOI8-U/RU (Ukrainian, Belarusian)"
	410	+ depends on NLS
	411	help
	412	If you want to display filenames with native language characters
	413	from the Microsoft FAT file system family or from JOLIET CD-ROMs
48910f33	414	@@ -447,6 +484,7 @@ config NLS_KOI8_U
48910f33	415
5de4fc43	416	config NLS_UTF8
	417	tristate "NLS UTF8"
	418	+ depends on NLS
	419	help
	420	If you want to display filenames with native language characters
	421	from the Microsoft FAT file system family or from JOLIET CD-ROMs
48910f33	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)
5de4fc43	426	if (default_nls != NULL)
	427	return default_nls;
	428	else
	429	- return &default_table;
	430	+ return &default_table;
	431	}
48910f33	432
5de4fc43	433	EXPORT_SYMBOL(register_nls);
48910f33	434	@@ -492,3 +492,5 @@ EXPORT_SYMBOL(utf8_mbtowc);
5de4fc43	435	EXPORT_SYMBOL(utf8_mbstowcs);
	436	EXPORT_SYMBOL(utf8_wctomb);
	437	EXPORT_SYMBOL(utf8_wcstombs);
	438	+
	439	+MODULE_LICENSE("Dual BSD/GPL");
48910f33	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
	444	case Opt_utf8:
	445	uopt->flags \|= (1 << UDF_FLAG_UTF8);
	446	break;
	447	-#ifdef CONFIG_NLS
	448	+#if defined(CONFIG_NLS) \|\| defined(CONFIG_NLS_MODULE)
	449	case Opt_iocharset:
	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");
	454	goto error_out;
	455	}
	456	-#ifdef CONFIG_NLS
	457	+#if defined(CONFIG_NLS) \|\| defined(CONFIG_NLS_MODULE)
	458	if ((uopt.flags & (1 << UDF_FLAG_NLS_MAP)) && !uopt.nls_map)
	459	{
	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]);
	463	}
	464	}
	465	-#ifdef CONFIG_NLS
	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);
	469	#endif
	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]);
	472	}
	473	}
	474	-#ifdef CONFIG_NLS
	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);
	478	#endif