summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--fs/cifs/asn1.c3
-rw-r--r--fs/cifs/cifsglob.h2
-rw-r--r--fs/cifs/file.c4
-rw-r--r--fs/cifs/transport.c2
4 files changed, 6 insertions, 5 deletions
diff --git a/fs/cifs/asn1.c b/fs/cifs/asn1.c
index e02010dd73ec..98539e2afe81 100644
--- a/fs/cifs/asn1.c
+++ b/fs/cifs/asn1.c
@@ -191,7 +191,8 @@ asn1_header_decode(struct asn1_ctx *ctx,
unsigned char **eoc,
unsigned int *cls, unsigned int *con, unsigned int *tag)
{
- unsigned int def, len;
+ unsigned int def = 0;
+ unsigned int len = 0;
if (!asn1_id_decode(ctx, cls, con, tag))
return 0;
diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
index a9c791edede5..cd421c76805e 100644
--- a/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
@@ -331,7 +331,7 @@ CIFS_SB(struct super_block *sb)
return sb->s_fs_info;
}
-static inline const char CIFS_DIR_SEP(const struct cifs_sb_info *cifs_sb)
+static inline char CIFS_DIR_SEP(const struct cifs_sb_info *cifs_sb)
{
if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_POSIX_PATHS)
return '/';
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 5ecda554f913..4173f23a71d9 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -791,8 +791,8 @@ static ssize_t cifs_write(struct file *file, const char *write_data,
pTcon = cifs_sb->tcon;
- cFYI(1,(" write %d bytes to offset %lld of %s", write_size,
- *poffset, file->f_dentry->d_name.name)); /* BB removeme BB */
+ cFYI(1,("write %zd bytes to offset %lld of %s", write_size,
+ *poffset, file->f_dentry->d_name.name));
if (file->private_data == NULL)
return -EBADF;
diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c
index 96f89eb66040..d5e0c4018f92 100644
--- a/fs/cifs/transport.c
+++ b/fs/cifs/transport.c
@@ -485,7 +485,7 @@ SendReceive2(const unsigned int xid, struct cifsSesInfo *ses,
BCC(in_buf) = le16_to_cpu(BCC(in_buf));
} else {
rc = -EIO;
- cFYI(1,("Bad MID state? "));
+ cFYI(1,("Bad MID state?"));
}
}
cifs_no_response_exit2: