[PATCH] Staging: lustre: lproc_osc: Change the variable to be tested

[PATCH] Staging: lustre: lproc_osc: Change the variable to be tested

[Shivani Bhardwaj]

The variable rc is supposed to hold the value returned by function
kstrtoul which can either be 0, -EINVAL (-22) or -ERANGE (-34).
Therefore, the check must be performed on rc instead of val for error
values. Also, val can never be positive.

Signed-off-by: Shivani Bhardwaj <shivanib134@gmail.com>
---
 drivers/staging/lustre/lustre/osc/lproc_osc.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/staging/lustre/lustre/osc/lproc_osc.c b/drivers/staging/lustre/lustre/osc/lproc_osc.c
index 053d508..cdc7f88 100644
--- a/drivers/staging/lustre/lustre/osc/lproc_osc.c
+++ b/drivers/staging/lustre/lustre/osc/lproc_osc.c
@@ -61,9 +61,7 @@ static ssize_t active_store(struct kobject *kobj, struct attribute *attr,
 	unsigned long val;
 
 	rc = kstrtoul(buffer, 10, &val);
-	if (rc)
-		return rc;
-	if (val < 0 || val > 1)
+	if (rc < 0)
 		return -ERANGE;
 
 	/* opposite senses */
-- 
2.1.0

Re: [Outreachy kernel] [PATCH] Staging: lustre: lproc_osc: Change the variable to be tested

[Julia Lawall]

On Fri, 16 Oct 2015, Shivani Bhardwaj wrote:

> The variable rc is supposed to hold the value returned by function
> kstrtoul which can either be 0, -EINVAL (-22) or -ERANGE (-34).
> Therefore, the check must be performed on rc instead of val for error
> values. Also, val can never be positive.

Typo.  val can never be negative.

julia

> 
> Signed-off-by: Shivani Bhardwaj <shivanib134@gmail.com>
> ---
>  drivers/staging/lustre/lustre/osc/lproc_osc.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/drivers/staging/lustre/lustre/osc/lproc_osc.c b/drivers/staging/lustre/lustre/osc/lproc_osc.c
> index 053d508..cdc7f88 100644
> --- a/drivers/staging/lustre/lustre/osc/lproc_osc.c
> +++ b/drivers/staging/lustre/lustre/osc/lproc_osc.c
> @@ -61,9 +61,7 @@ static ssize_t active_store(struct kobject *kobj, struct attribute *attr,
>  	unsigned long val;
>  
>  	rc = kstrtoul(buffer, 10, &val);
> -	if (rc)
> -		return rc;
> -	if (val < 0 || val > 1)
> +	if (rc < 0)
>  		return -ERANGE;
>  
>  	/* opposite senses */
> -- 
> 2.1.0
> 
> -- 
> You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com.
> To post to this group, send email to outreachy-kernel@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20151015185507.GA40274%40ubuntu.
> For more options, visit https://groups.google.com/d/optout.
> 

Re: [Outreachy kernel] [PATCH] Staging: lustre: lproc_osc: Change the variable to be tested

[Shivani Bhardwaj]

On Fri, Oct 16, 2015 at 1:20 AM, Julia Lawall <julia.lawall@lip6.fr> wrote:
> On Fri, 16 Oct 2015, Shivani Bhardwaj wrote:
>
>> The variable rc is supposed to hold the value returned by function
>> kstrtoul which can either be 0, -EINVAL (-22) or -ERANGE (-34).
>> Therefore, the check must be performed on rc instead of val for error
>> values. Also, val can never be positive.
>
> Typo.  val can never be negative.
>
> julia
>
Right. I had to write that for rc. rc can never be greater than zero
actually. This is what should be there.

>>
>> Signed-off-by: Shivani Bhardwaj <shivanib134@gmail.com>
>> ---
>>  drivers/staging/lustre/lustre/osc/lproc_osc.c | 4 +---
>>  1 file changed, 1 insertion(+), 3 deletions(-)
>>
>> diff --git a/drivers/staging/lustre/lustre/osc/lproc_osc.c b/drivers/staging/lustre/lustre/osc/lproc_osc.c
>> index 053d508..cdc7f88 100644
>> --- a/drivers/staging/lustre/lustre/osc/lproc_osc.c
>> +++ b/drivers/staging/lustre/lustre/osc/lproc_osc.c
>> @@ -61,9 +61,7 @@ static ssize_t active_store(struct kobject *kobj, struct attribute *attr,
>>       unsigned long val;
>>
>>       rc = kstrtoul(buffer, 10, &val);
>> -     if (rc)
>> -             return rc;
>> -     if (val < 0 || val > 1)
>> +     if (rc < 0)
>>               return -ERANGE;
>>
>>       /* opposite senses */
>> --
>> 2.1.0
>>
>> --
>> You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
>> To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com.
>> To post to this group, send email to outreachy-kernel@googlegroups.com.
>> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20151015185507.GA40274%40ubuntu.
>> For more options, visit https://groups.google.com/d/optout.
>>