aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cifs
diff options
context:
space:
mode:
authorSteve French <smfrench@austin.rr.com>2005-04-29 01:41:06 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-29 01:41:06 -0400
commitd0724714fd49aeec1383b94807174de7e96021bf (patch)
tree598d971c43acfae63d15a0f18e65c154639b3299 /fs/cifs
parent737b758c965a9b223ac1243ab38d9e507ac86c64 (diff)
[PATCH] cifs: Fix PPC64 compile error
.. and do not double endian convert the special characters whem mounted with mapchars mount parm. Signed-off-by: Steve French (sfrench@us.ibm.com) Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/cifs')
-rw-r--r--fs/cifs/misc.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
index 6d7bb427e4fa..75fd3bd6e233 100644
--- a/fs/cifs/misc.c
+++ b/fs/cifs/misc.c
@@ -519,13 +519,13 @@ dump_smb(struct smb_hdr *smb_buf, int smb_buf_length)
519/* Windows maps these to the user defined 16 bit Unicode range since they are 519/* Windows maps these to the user defined 16 bit Unicode range since they are
520 reserved symbols (along with \ and /), otherwise illegal to store 520 reserved symbols (along with \ and /), otherwise illegal to store
521 in filenames in NTFS */ 521 in filenames in NTFS */
522#define UNI_ASTERIK cpu_to_le16('*' + 0xF000) 522#define UNI_ASTERIK (__u16) ('*' + 0xF000)
523#define UNI_QUESTION cpu_to_le16('?' + 0xF000) 523#define UNI_QUESTION (__u16) ('?' + 0xF000)
524#define UNI_COLON cpu_to_le16(':' + 0xF000) 524#define UNI_COLON (__u16) (':' + 0xF000)
525#define UNI_GRTRTHAN cpu_to_le16('>' + 0xF000) 525#define UNI_GRTRTHAN (__u16) ('>' + 0xF000)
526#define UNI_LESSTHAN cpu_to_le16('<' + 0xF000) 526#define UNI_LESSTHAN (__u16) ('<' + 0xF000)
527#define UNI_PIPE cpu_to_le16('|' + 0xF000) 527#define UNI_PIPE (__u16) ('|' + 0xF000)
528#define UNI_SLASH cpu_to_le16('\\' + 0xF000) 528#define UNI_SLASH (__u16) ('\\' + 0xF000)
529 529
530/* Convert 16 bit Unicode pathname from wire format to string in current code 530/* Convert 16 bit Unicode pathname from wire format to string in current code
531 page. Conversion may involve remapping up the seven characters that are 531 page. Conversion may involve remapping up the seven characters that are
@@ -536,7 +536,7 @@ cifs_convertUCSpath(char *target, const __le16 * source, int maxlen,
536 const struct nls_table * cp) 536 const struct nls_table * cp)
537{ 537{
538 int i,j,len; 538 int i,j,len;
539 wchar_t src_char; 539 __u16 src_char;
540 540
541 for(i = 0, j = 0; i < maxlen; i++) { 541 for(i = 0, j = 0; i < maxlen; i++) {
542 src_char = le16_to_cpu(source[i]); 542 src_char = le16_to_cpu(source[i]);