diff options
| author | Jeff Layton <jlayton@redhat.com> | 2011-04-05 15:02:37 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2011-04-12 00:57:12 +0000 |
| commit | 581ade4d1c025eb10421eda0d0c0a2f04447d7c5 (patch) | |
| tree | b65a074f6f3cf769f3add8f59e37758e37e70fca /fs/cifs/cifs_unicode.h | |
| parent | c0c7b905e911a1f1faf515a24e849d4ffcdd0a8a (diff) | |
| download | op-kernel-dev-581ade4d1c025eb10421eda0d0c0a2f04447d7c5.zip op-kernel-dev-581ade4d1c025eb10421eda0d0c0a2f04447d7c5.tar.gz | |
cifs: clean up various nits in unicode routines (try #2)
Minor revision to the original patch. Don't abuse the __le16 variable
on the stack by casting it to wchar_t and handing it off to char2uni.
Declare an actual wchar_t on the stack instead. This fixes a valid
sparse warning.
Fix the spelling of UNI_ASTERISK. Eliminate the unneeded len_remaining
variable in cifsConvertToUCS.
Also, as David Howells points out. We were better off making
cifsConvertToUCS *not* use put_unaligned_le16 since it means that we
can't optimize the mapped characters at compile time. Switch them
instead to use cpu_to_le16, and simply use put_unaligned to set them
in the string.
Reported-and-acked-by: David Howells <dhowells@redhat.com>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/cifs_unicode.h')
| -rw-r--r-- | fs/cifs/cifs_unicode.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/cifs_unicode.h b/fs/cifs/cifs_unicode.h index 7fe6b52..644dd882 100644 --- a/fs/cifs/cifs_unicode.h +++ b/fs/cifs/cifs_unicode.h @@ -44,7 +44,7 @@ * reserved symbols (along with \ and /), otherwise illegal to store * in filenames in NTFS */ -#define UNI_ASTERIK (__u16) ('*' + 0xF000) +#define UNI_ASTERISK (__u16) ('*' + 0xF000) #define UNI_QUESTION (__u16) ('?' + 0xF000) #define UNI_COLON (__u16) (':' + 0xF000) #define UNI_GRTRTHAN (__u16) ('>' + 0xF000) |
