Skip to content

Commit

Permalink
[PATCH] cifs: Fix PPC64 compile error
Browse files Browse the repository at this point in the history
.. 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>
  • Loading branch information
Steve French authored and Linus Torvalds committed Apr 29, 2005
1 parent 737b758 commit d072471
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions fs/cifs/misc.c
Original file line number Diff line number Diff line change
Expand Up @@ -519,13 +519,13 @@ dump_smb(struct smb_hdr *smb_buf, int smb_buf_length)
/* Windows maps these to the user defined 16 bit Unicode range since they are
reserved symbols (along with \ and /), otherwise illegal to store
in filenames in NTFS */
#define UNI_ASTERIK cpu_to_le16('*' + 0xF000)
#define UNI_QUESTION cpu_to_le16('?' + 0xF000)
#define UNI_COLON cpu_to_le16(':' + 0xF000)
#define UNI_GRTRTHAN cpu_to_le16('>' + 0xF000)
#define UNI_LESSTHAN cpu_to_le16('<' + 0xF000)
#define UNI_PIPE cpu_to_le16('|' + 0xF000)
#define UNI_SLASH cpu_to_le16('\\' + 0xF000)
#define UNI_ASTERIK (__u16) ('*' + 0xF000)
#define UNI_QUESTION (__u16) ('?' + 0xF000)
#define UNI_COLON (__u16) (':' + 0xF000)
#define UNI_GRTRTHAN (__u16) ('>' + 0xF000)
#define UNI_LESSTHAN (__u16) ('<' + 0xF000)
#define UNI_PIPE (__u16) ('|' + 0xF000)
#define UNI_SLASH (__u16) ('\\' + 0xF000)

/* Convert 16 bit Unicode pathname from wire format to string in current code
page. Conversion may involve remapping up the seven characters that are
Expand All @@ -536,7 +536,7 @@ cifs_convertUCSpath(char *target, const __le16 * source, int maxlen,
const struct nls_table * cp)
{
int i,j,len;
wchar_t src_char;
__u16 src_char;

for(i = 0, j = 0; i < maxlen; i++) {
src_char = le16_to_cpu(source[i]);
Expand Down

0 comments on commit d072471

Please sign in to comment.