summaryrefslogtreecommitdiffstats
path: root/sys/fs/ntfs/ntfs_vfsops.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/fs/ntfs/ntfs_vfsops.c')
-rw-r--r--sys/fs/ntfs/ntfs_vfsops.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/sys/fs/ntfs/ntfs_vfsops.c b/sys/fs/ntfs/ntfs_vfsops.c
index cd5e062..a959e8c 100644
--- a/sys/fs/ntfs/ntfs_vfsops.c
+++ b/sys/fs/ntfs/ntfs_vfsops.c
@@ -350,15 +350,15 @@ ntfs_mountfs(devvp, mp, argsp, td)
ntmp->ntm_flag = argsp->flag;
/* Copy in the 8-bit to Unicode conversion table */
- if (argsp->flag & NTFSMNT_U2WTABLE) {
- ntfs_82u_init(ntmp, argsp->u2w);
+ /* Initialize Unicode to 8-bit table from 8toU table */
+ if (argsp->flag & NTFS_MFLAG_KICONV) {
+ ntfs_82u_init(ntmp, argsp->cs_local, argsp->cs_ntfs);
+ ntfs_u28_init(ntmp, NULL, argsp->cs_local, argsp->cs_ntfs);
} else {
- ntfs_82u_init(ntmp, NULL);
+ ntfs_82u_init(ntmp, NULL, NULL);
+ ntfs_u28_init(ntmp, ntmp->ntm_82u, NULL, NULL);
}
- /* Initialize Unicode to 8-bit table from 8toU table */
- ntfs_u28_init(ntmp, ntmp->ntm_82u);
-
mp->mnt_data = (qaddr_t)ntmp;
dprintf(("ntfs_mountfs(): case-%s,%s uid: %d, gid: %d, mode: %o\n",
@@ -794,3 +794,4 @@ static struct vfsops ntfs_vfsops = {
.vfs_vptofh = ntfs_vptofh,
};
VFS_SET(ntfs_vfsops, ntfs, 0);
+MODULE_VERSION(ntfs, 1);
OpenPOWER on IntegriCloud