lkml.org 
[lkml]   [2013]   [Mar]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [PATCH -mmotm] scsi: fix the wrong position of the comment
From
2013/3/12  <Valdis.Kletnieks@vt.edu>:
> On Sun, 10 Mar 2013 17:09:50 +0900, Akinobu Mita said:
>> This fixes the wrong position of the comment introduced by
>> scsi-rename-random32-to-prandom_u32.patch in the -mm tree.
>>
>> Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
>> Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
>> Cc: Andrew Vasquez <andrew.vasquez@qlogic.com>
>> ---
>> drivers/scsi/qla2xxx/qla_attr.c | 6 +++---
>> 1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
>> index 04bf7b8..e44d47e 100644
>> --- a/drivers/scsi/qla2xxx/qla_attr.c
>> +++ b/drivers/scsi/qla2xxx/qla_attr.c
>> @@ -1939,13 +1939,13 @@ qla24xx_vport_delete(struct fc_vport *fc_vport)
>> }
>>
>> /* No pending activities shall be there on the vha now */
>> - if (ql2xextended_error_logging & ql_dbg_user)
>> - msleep(prandom_u32() % 10);
>> + if (ql2xextended_error_logging & ql_dbg_user) {
>> /*
>> * Just to see if something falls on the net we have placed
>> * below
>> */
>> -
>> + msleep(prandom_u32() % 10);
>> + }
>> BUG_ON(atomic_read(&vha->vref_count));
>
> As others have noted, the msleep is potentially a crock. However,
> this particular patch is also incorrect - the *real* problem is
> that the 4 line comment connected to the BUG_ON is mis-indented.

In the original code (quoted below), the comment actually connected
to the msleep(), but the word "below" in the comment points to BUG_ON.
So the comment should also be updated in this patch...

/* No pending activities shall be there on the vha now */
if (ql2xextended_error_logging & ql_dbg_user)
msleep(random32()%10); /* Just to see if something falls on
* the net we have placed below */

BUG_ON(atomic_read(&vha->vref_count));


\
 
 \ /
  Last update: 2013-03-13 14:42    [W:0.086 / U:0.016 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site