diff mbox

[2/5] blk-throttle: Move an assignment for the variable "ret" in tg_set_conf()

Message ID d20da6bc-b84a-3b2c-614c-68ace67db7e0@users.sourceforge.net (mailing list archive)
State New, archived
Headers show

Commit Message

SF Markus Elfring Jan. 22, 2017, 8:32 a.m. UTC 
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sat, 21 Jan 2017 21:40:38 +0100

A local variable was set to an error code before a concrete error situation
was detected. Thus move the corresponding assignment into an if branch
to indicate a software failure there.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 block/blk-throttle.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Johannes Thumshirn Jan. 23, 2017, 9:16 a.m. UTC | #1 
On Sun, Jan 22, 2017 at 09:32:19AM +0100, SF Markus Elfring wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Sat, 21 Jan 2017 21:40:38 +0100
> 
> A local variable was set to an error code before a concrete error situation
> was detected. Thus move the corresponding assignment into an if branch
> to indicate a software failure there.
> 
> This issue was detected by using the Coccinelle software.
> 
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
> ---

See my answer to the last patch.
diff mbox

Patch

diff --git a/block/blk-throttle.c b/block/blk-throttle.c
index 51d112deb02e..b392b48310ba 100644
--- a/block/blk-throttle.c
+++ b/block/blk-throttle.c
@@ -1191,9 +1191,10 @@  static ssize_t tg_set_conf(struct kernfs_open_file *of,
 	if (ret)
 		return ret;
 
-	ret = -EINVAL;
-	if (sscanf(ctx.body, "%llu", &v) != 1)
+	if (sscanf(ctx.body, "%llu", &v) != 1) {
+		ret = -EINVAL;
 		goto out_finish;
+	}
 	if (!v)
 		v = -1;