aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cifs/connect.c
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2012-01-18 23:32:33 -0500
committerSteve French <sfrench@us.ibm.com>2012-01-18 23:32:33 -0500
commitacbbb76a26648dfae6fed0989879e40d75692bfc (patch)
tree509620f02e6d86444ea426bc188ba943381e5815 /fs/cifs/connect.c
parentc56001879bc091eee0c7a8e6e94ea0bea63c3012 (diff)
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/connect.c')
-rw-r--r--fs/cifs/connect.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 28f23c03da53..986709a8d903 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -3644,7 +3644,7 @@ CIFSTCon(unsigned int xid, struct cifs_ses *ses,
3644 if (ses->capabilities & CAP_UNICODE) { 3644 if (ses->capabilities & CAP_UNICODE) {
3645 smb_buffer->Flags2 |= SMBFLG2_UNICODE; 3645 smb_buffer->Flags2 |= SMBFLG2_UNICODE;
3646 length = 3646 length =
3647 cifs_strtoUCS((__le16 *) bcc_ptr, tree, 3647 cifs_strtoUTF16((__le16 *) bcc_ptr, tree,
3648 6 /* max utf8 char length in bytes */ * 3648 6 /* max utf8 char length in bytes */ *
3649 (/* server len*/ + 256 /* share len */), nls_codepage); 3649 (/* server len*/ + 256 /* share len */), nls_codepage);
3650 bcc_ptr += 2 * length; /* convert num 16 bit words to bytes */ 3650 bcc_ptr += 2 * length; /* convert num 16 bit words to bytes */
@@ -3699,7 +3699,7 @@ CIFSTCon(unsigned int xid, struct cifs_ses *ses,
3699 3699
3700 /* mostly informational -- no need to fail on error here */ 3700 /* mostly informational -- no need to fail on error here */
3701 kfree(tcon->nativeFileSystem); 3701 kfree(tcon->nativeFileSystem);
3702 tcon->nativeFileSystem = cifs_strndup_from_ucs(bcc_ptr, 3702 tcon->nativeFileSystem = cifs_strndup_from_utf16(bcc_ptr,
3703 bytes_left, is_unicode, 3703 bytes_left, is_unicode,
3704 nls_codepage); 3704 nls_codepage);
3705 3705