From 168660f24dfc46c2702acbe4701a446f42a59578 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Fri, 21 Jul 2000 22:00:56 +0000
Subject: Merge with Linux 2.4.0-test5-pre3.

---
 fs/ntfs/fs.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'fs/ntfs/fs.c')

diff --git a/fs/ntfs/fs.c b/fs/ntfs/fs.c
index 96178b4bb..0d372ddfa 100644
--- a/fs/ntfs/fs.c
+++ b/fs/ntfs/fs.c
@@ -362,8 +362,11 @@ static int parse_options(ntfs_volume* vol,char *opt)
 	if((vol->nct & (nct_uni_xlate | nct_map | nct_utf8))==0)
 		/* default to UTF-8 */
 		vol->nct=nct_utf8;
-	if(!vol->nls_map)
+	if(!vol->nls_map){
 		vol->nls_map=load_nls_default();
+		if (vol->nls_map)
+			vol->nct=nct_map | (vol->nct&nct_uni_xlate);
+	}
 	return 1;
 
  needs_arg:
-- 
cgit v1.2.3