[linux-cifs-client] [PATCH] cifs: initialize nbytes at the beginning of CIFSSMBWrite()

Steve French smfrench at gmail.com
Tue Mar 30 08:25:39 MDT 2010


This looks like we want to push it upstream ASAP - any objections?

On Tue, Mar 30, 2010 at 8:33 AM, Jeff Layton <jlayton at samba.org> wrote:
> On Tue, 30 Mar 2010 18:54:01 +0530
> Suresh Jayaraman <sjayaraman at suse.de> wrote:
>
>> 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.
>>
>> Signed-off-by: Suresh Jayaraman <sjayaraman at suse.de>
>> ---
>>  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 7cc7f83..e1f90a3 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;
>> _______________________________________________
>> linux-cifs-client mailing list
>> linux-cifs-client at lists.samba.org
>> https://lists.samba.org/mailman/listinfo/linux-cifs-client
>>
>
> Reviewed-by: Jeff Layton <jlayton at samba.org>
>



-- 
Thanks,

Steve


More information about the linux-cifs-client mailing list