Re: [PATCH] cifs: initialize nbytes at the beginning of CIFSSMBWrite()

On 03/30/2010 08:58 PM, Shirish Pargaonkar wrote:
> nitpicking, we probably do not need braces around if check then.

Good catch, removed the unnecessary brace. Not sure why checkpatch.pl didn't
catch this.


> On Tue, Mar 30, 2010 at 9:34 AM, Jeff Layton <[email protected]> wrote:
>> On Tue, 30 Mar 2010 09:25:39 -0500
>> Steve French <[email protected]> wrote:
>>
>>> This looks like we want to push it upstream ASAP - any objections?
>>>
>>
>> No objections. It's a straightforward bugfix. Maybe even reasonable for
>> stable.
>>
>>> On Tue, Mar 30, 2010 at 8:33 AM, Jeff Layton <[email protected]> wrote:
>>>> On Tue, 30 Mar 2010 18:54:01 +0530
>>>> Suresh Jayaraman <[email protected]> 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 <[email protected]>
>>>>> ---
>>>>> �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
>>>>> [email protected]
>>>>> https://lists.samba.org/mailman/listinfo/linux-cifs-client
>>>>>
>>>>
>>>> Reviewed-by: Jeff Layton <[email protected]>
>>>>
>>>
>>>
>>>
>>
>>
>> --
>> Jeff Layton <[email protected]>
>> _______________________________________________
>> linux-cifs-client mailing list
>> [email protected]
>> https://lists.samba.org/mailman/listinfo/linux-cifs-client
>>
> _______________________________________________
> linux-cifs-client mailing list
> [email protected]
> https://lists.samba.org/mailman/listinfo/linux-cifs-client


-- 
Suresh Jayaraman
_______________________________________________
linux-cifs-client mailing list
[email protected]
https://lists.samba.org/mailman/listinfo/linux-cifs-client