diff options
| author | Steve French <sfrench@us.ibm.com> | 2010-04-03 19:20:21 +0200 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2010-04-03 19:20:21 +0200 |
| commit | a24e2d7d8f512340991ef0a59cb5d08d491b8e98 (patch) | |
| tree | ceda70bdfd41835725f951d026073056f38aed42 | |
| parent | [CIFS] Add mmap for direct, nobrl cifs mount types (diff) | |
| download | linux-a24e2d7d8f512340991ef0a59cb5d08d491b8e98.tar.xz linux-a24e2d7d8f512340991ef0a59cb5d08d491b8e98.zip | |
[CIFS] initialize nbytes at the beginning of CIFSSMBWrite()
By doing this we always overwrite nbytes value that is being passed on to
CIFSSMBWrite() and need not rely on the callers to initialize. CIFSSMBWrite2 is
doing this already.
CC: Stable <stable@kernel.org>
Reviewed-by: Shirish Pargaonkar <shirishpargaonkar@gmail.com>
Reviewed-by: Jeff Layton <jlayton@samba.org>
Signed-off-by: Suresh Jayaraman <sjayaraman@suse.de>
Signed-off-by: Steve French <sfrench@us.ibm.com>
| -rw-r--r-- | fs/cifs/cifssmb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c index 7cc7f83e9314..e1f90a3a0162 100644 --- a/fs/cifs/cifssmb.c +++ b/fs/cifs/cifssmb.c @@ -1430,6 +1430,8 @@ CIFSSMBWrite(const int xid, struct cifsTconInfo *tcon, __u32 bytes_sent; __u16 byte_count; + *nbytes = 0; + /* cFYI(1, ("write at %lld %d bytes", offset, count));*/ if (tcon->ses == NULL) return -ECONNABORTED; @@ -1512,7 +1514,6 @@ CIFSSMBWrite(const int xid, struct cifsTconInfo *tcon, cifs_stats_inc(&tcon->num_writes); if (rc) { cFYI(1, ("Send error in write = %d", rc)); - *nbytes = 0; } else { *nbytes = le16_to_cpu(pSMBr->CountHigh); *nbytes = (*nbytes) << 16; |