Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752029AbbLMN4A (ORCPT ); Sun, 13 Dec 2015 08:56:00 -0500 Received: from mout.web.de ([212.227.15.3]:59933 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751666AbbLMNz6 (ORCPT ); Sun, 13 Dec 2015 08:55:58 -0500 Subject: [PATCH 3/7] staging: lustre: Rename a jump label for a kfree(key) call To: Andreas Dilger , Greg Kroah-Hartman , Oleg Drokin , lustre-devel@lists.lustre.org, devel@driverdev.osuosl.org References: <566ABCD9.1060404@users.sourceforge.net> <566D7733.1030102@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: <566D78E2.9060209@users.sourceforge.net> Date: Sun, 13 Dec 2015 14:55:46 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 MIME-Version: 1.0 In-Reply-To: <566D7733.1030102@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:urJjG43fpdHRhDBomxyTTs9p1hRGGeIyzhJS8K0ED+FsVSuLlqZ w4FKz80Gazj05ZqfxtvbUZuUMpwfpZicFYcHozs9iwme2eZcGOxK3xscZou5VnJMRb3eGaO EQzxeFc9K3628OtZLJEZtiE21S9jDN2PU3rWLds8qQcYosLM1wPRqLYCJ9PX+ZXWGzU5ACe JKuj/j5X/ojsqNY5zfGsQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:DRx0TcFpitE=:1+SZxOAKOhqsfDSs39rGg8 IW2NTvhlP3JGgsvR0mPycnMqMYMQ3Iya9xtpTRttK4+K+k7Fut7uzqjl549STel28elKOxO5u 6u2nl7FYSs5PAOLRyfo0HHcvulqRXSJ6KXKz98YSqWEnKPC7soOGlLdgrBuRaaWuKrww2WXko KXSpo+70IUekrswqTFOYFGcJ6oN0tQ2DKzjNM/C5hRc7glwTX2PTGGs07b/OlBioRtz7ftGP7 GIKQ3QptrT66D18Uz75WjX4ZYYI1UuuraLTqKiCxI8y36Bxj2+2c3/JuEnI7AamayXklgadB2 a2QBn+jJjj3QN9oTANjukFq9YfCJ9s3k/O11eEtJqlhoc2HMfa5ubH1ZyUKcQT+oEh4ij93Du xqpoQnxyq0LkuImSDLv4vVCNt8KIghHTzrfGRrfPBRYhDNgenBaOMGLv6a1DHhLund9i4ywSM OrOVb2COse5ntmRpFQ3aqhapmQbJ1v8C/l1b63xSFqC/mhTq6kRO79NnhRri9zoyC+afGMcBE sAB2ygDTpdgIVPlytAY7Zr+CRbrIALo1fxL42PT/+bnTHsg65XK4GrubX293iUhkXmehhD9g8 O0AmZJ7H86FIlF4AWH301eoyvwdOHErzYtKVpM9+FxeuJMWcPmPgpQWltHjLD5He7FdfuoJlN fc6Mr9quf4I0briMc41mErfLpTRwshkw5QEYY8pmmy1tbbnEjFvoRoxbI3H6bTvssvcF+Ltja k36H/ScAAlH10gNiy6IMUMCNwoMP/1ZzjBYStrPNOykkcLWP5fHhUbp6IW7NYQ0EZE+bczNqy POUv81d Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1769 Lines: 58 From: Markus Elfring Date: Sun, 13 Dec 2015 10:56:35 +0100 This issue was detected by using the Coccinelle software. Choose a jump label according to the current Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/staging/lustre/lustre/mdc/mdc_request.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/staging/lustre/lustre/mdc/mdc_request.c b/drivers/staging/lustre/lustre/mdc/mdc_request.c index 2a76685..2085ba6 100644 --- a/drivers/staging/lustre/lustre/mdc/mdc_request.c +++ b/drivers/staging/lustre/lustre/mdc/mdc_request.c @@ -1125,7 +1125,7 @@ static int mdc_ioc_fid2path(struct obd_export *exp, struct getinfo_fid2path *gf) if (!fid_is_sane(&gf->gf_fid)) { rc = -EINVAL; - goto out; + goto free_key; } /* Val is struct getinfo_fid2path result plus path */ @@ -1133,20 +1133,19 @@ static int mdc_ioc_fid2path(struct obd_export *exp, struct getinfo_fid2path *gf) rc = obd_get_info(NULL, exp, keylen, key, &vallen, gf, NULL); if (rc != 0 && rc != -EREMOTE) - goto out; + goto free_key; if (vallen <= sizeof(*gf)) { rc = -EPROTO; - goto out; + goto free_key; } else if (vallen > sizeof(*gf) + gf->gf_pathlen) { rc = -EOVERFLOW; - goto out; + goto free_key; } CDEBUG(D_IOCTL, "path get "DFID" from %llu #%d\n%s\n", PFID(&gf->gf_fid), gf->gf_recno, gf->gf_linkno, gf->gf_path); - -out: +free_key: kfree(key); return rc; } -- 2.6.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/