Skip to contentSkip to conversation

Staging: lustre: lproc_osc: Change the variable to be tested

PATCH Superseded Shivani Bhardwaj 2 participants 3 messages Oct 15, 2015 Staging

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Staging: lustre: lproc_osc: Change the variable to be tested

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.

---
 drivers/staging/lustre/lustre/osc/lproc_osc.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/staging/lustre/lustre/osc/lproc_osc.c +1 -3
index 053d508..cdc7f88 100644
@@ -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 */
Signature · 1 line
2.1.0
#1 lore raw
Quoted 4 lines · 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.

Typo. val can never be negative.

julia

Quoted 31 lines
---
 drivers/staging/lustre/lustre/osc/lproc_osc.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/staging/lustre/lustre/osc/lproc_osc.c +1 -3
index 053d508..cdc7f88 100644
@@ -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 */
Signature · 8 lines
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 [email protected].
To post to this group, send email to [email protected].
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.
#2 lore raw
Quoted 11 lines · Julia Lawall
Quoted 4 lines · 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.

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.

Quoted 31 lines
Quoted 31 lines
---
 drivers/staging/lustre/lustre/osc/lproc_osc.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/staging/lustre/lustre/osc/lproc_osc.c +1 -4
index 053d508..cdc7f88 100644
@@ -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 [email protected]. To post to this group, send email to [email protected].
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.