diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-21 22:00:56 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-21 22:00:56 +0000 |
| commit | 168660f24dfc46c2702acbe4701a446f42a59578 (patch) | |
| tree | f431368afbf6b1b71809cf3fd904d800ea126f4d /fs/ntfs/fs.c | |
| parent | 6420f767924fa73b0ea267864d96820815f4ba5a (diff) | |
Merge with Linux 2.4.0-test5-pre3.
Diffstat (limited to 'fs/ntfs/fs.c')
| -rw-r--r-- | fs/ntfs/fs.c | 5 |
1 files changed, 4 insertions, 1 deletions
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: |