From 115032183dea5bca585726782fe5ab56a56cb592 Mon Sep 17 00:00:00 2001
From: Steve French <sfrench@us.ibm.com>
Date: Thu, 15 Sep 2005 20:44:50 -0700
Subject: [PATCH] --- yaml --- r: 12048 b: refs/heads/master c:
 ab2f218f4fa2c36ecd39ac1406eec1e63cd430bd h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/fs/cifs/asn1.c      | 3 ++-
 trunk/fs/cifs/cifsglob.h  | 2 +-
 trunk/fs/cifs/file.c      | 4 ++--
 trunk/fs/cifs/transport.c | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 7e4f02830756..d3362fb373c2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a899e76683639486846ce17dbaa0c2ec1ae5ab5
+refs/heads/master: ab2f218f4fa2c36ecd39ac1406eec1e63cd430bd
diff --git a/trunk/fs/cifs/asn1.c b/trunk/fs/cifs/asn1.c
index e02010dd73ec..98539e2afe81 100644
--- a/trunk/fs/cifs/asn1.c
+++ b/trunk/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/trunk/fs/cifs/cifsglob.h b/trunk/fs/cifs/cifsglob.h
index a9c791edede5..cd421c76805e 100644
--- a/trunk/fs/cifs/cifsglob.h
+++ b/trunk/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/trunk/fs/cifs/file.c b/trunk/fs/cifs/file.c
index 5ecda554f913..4173f23a71d9 100644
--- a/trunk/fs/cifs/file.c
+++ b/trunk/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/trunk/fs/cifs/transport.c b/trunk/fs/cifs/transport.c
index 96f89eb66040..d5e0c4018f92 100644
--- a/trunk/fs/cifs/transport.c
+++ b/trunk/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: