projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[firefly-linux-kernel-4.4.55.git]
/
fs
/
ntfs
/
unistr.c
diff --git
a/fs/ntfs/unistr.c
b/fs/ntfs/unistr.c
index 19c42e231b4411ca270d48e2b6b3fac927190554..a389a5a16c84af96be71d6c399b3d7f9b1e52d17 100644
(file)
--- 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 "
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)
if (ns != *outs)
kfree(ns);
if (wc != -ENAMETOOLONG)