Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 12048
b: refs/heads/master
c: ab2f218
h: refs/heads/master
v: v3
  • Loading branch information
Steve French committed Sep 16, 2005
1 parent e52be85 commit 1150321
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9a899e76683639486846ce17dbaa0c2ec1ae5ab5
refs/heads/master: ab2f218f4fa2c36ecd39ac1406eec1e63cd430bd
3 changes: 2 additions & 1 deletion trunk/fs/cifs/asn1.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/cifs/cifsglob.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 '/';
Expand Down
4 changes: 2 additions & 2 deletions trunk/fs/cifs/file.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/cifs/transport.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 1150321

Please sign in to comment.