summaryrefslogtreecommitdiffstats
path: root/fs/cifs
diff options
context:
space:
mode:
authorSteve French <smfrench@gmail.com>2017-03-02 15:42:48 -0600
committerSteve French <smfrench@gmail.com>2017-03-02 23:11:54 -0600
commit284316dd42a2027afe37df34c5199eb4eabed8fd (patch)
tree5589fe063a8e790857a2f63b04979dad59e77950 /fs/cifs
parent9d49640a21bffd730a6ebf2a0032e022f7caf84a (diff)
downloadlinux-stable-284316dd42a2027afe37df34c5199eb4eabed8fd.tar.gz
linux-stable-284316dd42a2027afe37df34c5199eb4eabed8fd.tar.bz2
linux-stable-284316dd42a2027afe37df34c5199eb4eabed8fd.zip
CIFS: Fix sparse warnings
Fix two minor sparse compile check warnings Signed-off-by: Steve French <steve.french@primarydata.com> Acked-by: Pavel Shilovsky <pshilov@microsoft.com> Reviewed-by: Aurelien Aptel <aaptel@suse.com>
Diffstat (limited to 'fs/cifs')
-rw-r--r--fs/cifs/cifs_unicode.h6
-rw-r--r--fs/cifs/cifssmb.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/fs/cifs/cifs_unicode.h b/fs/cifs/cifs_unicode.h
index 479bc0a941f3..3d7298cc0aeb 100644
--- a/fs/cifs/cifs_unicode.h
+++ b/fs/cifs/cifs_unicode.h
@@ -130,10 +130,10 @@ wchar_t cifs_toupper(wchar_t in);
* Returns:
* Address of the first string
*/
-static inline wchar_t *
-UniStrcat(wchar_t *ucs1, const wchar_t *ucs2)
+static inline __le16 *
+UniStrcat(__le16 *ucs1, const __le16 *ucs2)
{
- wchar_t *anchor = ucs1; /* save a pointer to start of ucs1 */
+ __le16 *anchor = ucs1; /* save a pointer to start of ucs1 */
while (*ucs1++) ; /* To end of first string */
ucs1--; /* Return to the null */
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
index 5005c7995b6a..066950671929 100644
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
@@ -4886,7 +4886,7 @@ getDFSRetry:
le16_to_cpu(pSMBr->t2.DataCount),
num_of_nodes, target_nodes, nls_codepage,
remap, search_name,
- pSMBr->hdr.Flags2 & SMBFLG2_UNICODE);
+ (pSMBr->hdr.Flags2 & SMBFLG2_UNICODE) != 0);
GetDFSRefExit:
cifs_buf_release(pSMB);