aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cifs
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2005-09-15 23:44:50 -0400
committerSteve French <sfrench@us.ibm.com>2005-09-15 23:44:50 -0400
commitab2f218f4fa2c36ecd39ac1406eec1e63cd430bd (patch)
tree80a361ff0417e1a9733fd49cbb133797854da264 /fs/cifs
parent9a899e76683639486846ce17dbaa0c2ec1ae5ab5 (diff)
[CIFS] Fix compiler warnings
Fix some compiler warnings noticed on x64 by me and ppc64 by Shaggy Signed-off-by: Steve French (sfrench@us.ibm.com)
Diffstat (limited to 'fs/cifs')
-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,
191 unsigned char **eoc, 191 unsigned char **eoc,
192 unsigned int *cls, unsigned int *con, unsigned int *tag) 192 unsigned int *cls, unsigned int *con, unsigned int *tag)
193{ 193{
194 unsigned int def, len; 194 unsigned int def = 0;
195 unsigned int len = 0;
195 196
196 if (!asn1_id_decode(ctx, cls, con, tag)) 197 if (!asn1_id_decode(ctx, cls, con, tag))
197 return 0; 198 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)
331 return sb->s_fs_info; 331 return sb->s_fs_info;
332} 332}
333 333
334static inline const char CIFS_DIR_SEP(const struct cifs_sb_info *cifs_sb) 334static inline char CIFS_DIR_SEP(const struct cifs_sb_info *cifs_sb)
335{ 335{
336 if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_POSIX_PATHS) 336 if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_POSIX_PATHS)
337 return '/'; 337 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,
791 791
792 pTcon = cifs_sb->tcon; 792 pTcon = cifs_sb->tcon;
793 793
794 cFYI(1,(" write %d bytes to offset %lld of %s", write_size, 794 cFYI(1,("write %zd bytes to offset %lld of %s", write_size,
795 *poffset, file->f_dentry->d_name.name)); /* BB removeme BB */ 795 *poffset, file->f_dentry->d_name.name));
796 796
797 if (file->private_data == NULL) 797 if (file->private_data == NULL)
798 return -EBADF; 798 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,
485 BCC(in_buf) = le16_to_cpu(BCC(in_buf)); 485 BCC(in_buf) = le16_to_cpu(BCC(in_buf));
486 } else { 486 } else {
487 rc = -EIO; 487 rc = -EIO;
488 cFYI(1,("Bad MID state? ")); 488 cFYI(1,("Bad MID state?"));
489 } 489 }
490 } 490 }
491cifs_no_response_exit2: 491cifs_no_response_exit2: