From patchwork Sun Jan 22 08:34:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 9530841 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 135D86020B for ; Sun, 22 Jan 2017 08:34:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0457027DA4 for ; Sun, 22 Jan 2017 08:34:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E93C228306; Sun, 22 Jan 2017 08:34:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9C69027DA4 for ; Sun, 22 Jan 2017 08:34:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751436AbdAVIeI (ORCPT ); Sun, 22 Jan 2017 03:34:08 -0500 Received: from mout.web.de ([212.227.15.4]:50082 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751062AbdAVIeH (ORCPT ); Sun, 22 Jan 2017 03:34:07 -0500 Received: from [192.168.1.2] ([78.48.136.24]) by smtp.web.de (mrweb002 [213.165.67.108]) with ESMTPSA (Nemesis) id 0LtoCT-1cLcpF2RhV-011ASP; Sun, 22 Jan 2017 09:34:04 +0100 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 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.6.0 MIME-Version: 1.0 In-Reply-To: X-Provags-ID: V03:K0:9ztrIdjd+4bkahL10tGVPFnsJVe4L9flVz+Q3OOaMUfIIFchA2R iTdphAsqhb+VviDROkYFnzO7AkWwfGcuirEyb1PXv3V2cJJ6WckgVFuWY6+VG5CJNUqHjnF DCNoBZMP92KHdYhQBzWpn0soUj5ouiwZMyAcBGWsSfVE3hUcE6v9BWxo6pfbkXugDCoVgFf /IPAbDD00JvgwODt+mBIQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:90Xc4rRVKac=:aal3G5hfFZ/5ZU/RqkTq6M RWHOuuakE0HfqzzBoCaJXI4S4FAyogBdHyKjdkraErYumKauOXVEZRts3HixO8Ui+UTiF//94 pRbrPHHIzv7Ris62diDL0ehgOOnd6hiXQsyPd+wyr6M+VJwA2nSIF/voIA63za6CL22YDb2Yx m8cf6On9sV6+9lpPBb4wdblZl0hdZErhxk69grGbeLvsaTFEt0/oa3tIzcYK4/H9wAYN/496V 40B0ItHvtoT0LrOUKrpcGDZHXg/6Gp8mJAiTHSY+x8UXREciqMALRl4A2L/siDfpaqdSJhjSF hBhTqfZXB3jV5eI99UQLKefggCcdYFsMEoYRuY/pGyXKz1YcRlxpkgwmvWpoR+SK4UKj5oy03 yVY7KTZyPLiAkZbeI+OWhdt1sLOQZPDRzHCIGnG39OwS6aeKaWnCICSVsGaaJzOWdXpAd29/4 wl46vR/F+UtleyuRnUlwPmJzzIjNaYTFVaKO2CF6CrF9cTyf8Af87pCXgvimYQvOV/Bw29mwb 6oaPWmTRHWI9dhLPU6eTO0hOc4GTNT1mypssPQtL6/lQ8FhALiqwUOMHZJIPztfkMs7mHO3KC 0DQE5uB/veKxN7hcBi1Gh2AXYdaG1yIcjrTn0L7T8pMWGtj/0SGRjbko5K77yTTAlTGIJnqs/ hNQ4S7eE4bTpbB385Jaq5rgX1vGOLCysc5HAz8O623LvZfDykbbE6j0vGi/i6+FVNdZf9nlMm VjhBgNBMxqLmxTNwLoFGr3JuWqrSxNssJ4uskEtpGLR1V3CUstgrTsFGVjKHhM9YMOkWuNIKL uND3cnB Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 {