diff options
| author | Steve French <sfrench@us.ibm.com> | 2012-01-19 05:32:33 +0100 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2012-01-19 05:32:33 +0100 |
| commit | acbbb76a26648dfae6fed0989879e40d75692bfc (patch) | |
| tree | 509620f02e6d86444ea426bc188ba943381e5815 /fs/cifs/readdir.c | |
| parent | [CIFS] ACL and FSCACHE support no longer EXPERIMENTAL (diff) | |
| download | linux-acbbb76a26648dfae6fed0989879e40d75692bfc.tar.xz linux-acbbb76a26648dfae6fed0989879e40d75692bfc.zip | |
CIFS: Rename *UCS* functions to *UTF16*
to reflect the unicode encoding used by CIFS protocol.
Signed-off-by: Pavel Shilovsky <piastry@etersoft.ru>
Acked-by: Jeff Layton <jlayton@samba.org>
Reviewed-by: Shirish Pargaonkar <shirishpargaonkar@gmail.com>
Diffstat (limited to 'fs/cifs/readdir.c')
| -rw-r--r-- | fs/cifs/readdir.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c index a090bbe6ee29..e2bbc683e018 100644 --- a/fs/cifs/readdir.c +++ b/fs/cifs/readdir.c @@ -647,10 +647,11 @@ static int cifs_filldir(char *find_entry, struct file *file, filldir_t filldir, name.name = scratch_buf; name.len = - cifs_from_ucs2((char *)name.name, (__le16 *)de.name, - UNICODE_NAME_MAX, - min(de.namelen, (size_t)max_len), nlt, - cifs_sb->mnt_cifs_flags & + cifs_from_utf16((char *)name.name, (__le16 *)de.name, + UNICODE_NAME_MAX, + min_t(size_t, de.namelen, + (size_t)max_len), nlt, + cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR); name.len -= nls_nullsize(nlt); } else { |