From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Subject: [PATCH 4/5] cfq-iosched: Move an assignment for the variable "ret" in __cfqg_set_weight_device() To: linux-block@vger.kernel.org, Jens Axboe References: Cc: LKML , kernel-janitors@vger.kernel.org From: SF Markus Elfring Message-ID: <66f510a1-432a-260b-2785-6274a3e263b5@users.sourceforge.net> Date: Sun, 22 Jan 2017 09:34:03 +0100 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 List-ID: From: Markus Elfring Date: Sat, 21 Jan 2017 22:26: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 --- block/cfq-iosched.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index c73a6fcaeb9d..454297fe8fd6 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c @@ -1788,9 +1788,10 @@ static ssize_t __cfqg_set_weight_device(struct kernfs_open_file *of, if (sscanf(ctx.body, "%llu", &v) == 1) { /* require "default" on dfl */ - ret = -ERANGE; - if (!v && on_dfl) + if (!v && on_dfl) { + ret = -ERANGE; goto out_finish; + } } else if (!strcmp(strim(ctx.body), "default")) { v = 0; } else { -- 2.11.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: SF Markus Elfring Date: Sun, 22 Jan 2017 08:34:03 +0000 Subject: [PATCH 4/5] cfq-iosched: Move an assignment for the variable "ret" in __cfqg_set_weight_device() Message-Id: <66f510a1-432a-260b-2785-6274a3e263b5@users.sourceforge.net> List-Id: References: In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-block@vger.kernel.org, Jens Axboe Cc: LKML , kernel-janitors@vger.kernel.org From: Markus Elfring Date: Sat, 21 Jan 2017 22:26: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 --- block/cfq-iosched.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index c73a6fcaeb9d..454297fe8fd6 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c @@ -1788,9 +1788,10 @@ static ssize_t __cfqg_set_weight_device(struct kernfs_open_file *of, if (sscanf(ctx.body, "%llu", &v) = 1) { /* require "default" on dfl */ - ret = -ERANGE; - if (!v && on_dfl) + if (!v && on_dfl) { + ret = -ERANGE; goto out_finish; + } } else if (!strcmp(strim(ctx.body), "default")) { v = 0; } else { -- 2.11.0