summaryrefslogtreecommitdiffstats
path: root/fs/ntfs/unistr.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-09-14 08:57:30 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-09-14 08:57:30 -0400
commitdbaa9a9d2b37d838125fb7f2b9fdc5dc5fa4eaa9 (patch)
tree8641efeba632bddfa0e486b41a5f19578b1a1a31 /fs/ntfs/unistr.c
parent142e27fc8a3619471669d6241784eec9167c47d1 (diff)
parent2f4ba45a75d6383b4a1201169a808ffea416ffa0 (diff)
downloadkernel-crypto-dbaa9a9d2b37d838125fb7f2b9fdc5dc5fa4eaa9.tar.gz
kernel-crypto-dbaa9a9d2b37d838125fb7f2b9fdc5dc5fa4eaa9.tar.xz
kernel-crypto-dbaa9a9d2b37d838125fb7f2b9fdc5dc5fa4eaa9.zip
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'fs/ntfs/unistr.c')
-rw-r--r--fs/ntfs/unistr.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ntfs/unistr.c b/fs/ntfs/unistr.c
index 19c42e231b4..a389a5a16c8 100644
--- a/fs/ntfs/unistr.c
+++ b/fs/ntfs/unistr.c
@@ -372,7 +372,8 @@ retry: wc = nls->uni2char(le16_to_cpu(ins[i]), ns + o,
return -EINVAL;
conversion_err:
ntfs_error(vol->sb, "Unicode name contains characters that cannot be "
- "converted to character set %s.", nls->charset);
+ "converted to character set %s. You might want to "
+ "try to use the mount option nls=utf8.", nls->charset);
if (ns != *outs)
kfree(ns);
if (wc != -ENAMETOOLONG)