Commit 66345f50 authored by Jeff Layton's avatar Jeff Layton Committed by Steve French
Browse files

cifs: move #defines for mapchars into cifs_unicode.h 



Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
Acked-by: default avatarSuresh Jayaraman <sjayaraman@suse.de>
Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent 912bc6ae

fs/cifs/cifs_unicode.h

+13 −0
Original line number Diff line number Diff line
@@ -37,6 +37,19 @@ 


#define  UNIUPR_NOLOWER		/* Example to not expand lower case tables */



/*

 * 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     (__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)



/* Just define what we want from uniupr.h.  We don't want to define the tables

 * in each source file.

 */

fs/cifs/misc.c

+0 −11
Original line number Diff line number Diff line
@@ -635,17 +635,6 @@ dump_smb(struct smb_hdr *smb_buf, int smb_buf_length) 
	return;

}



/* 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     (__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

   only legal in POSIX-like OS (if they are present in the string). Path