From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752000AbbLMNxA (ORCPT ); Sun, 13 Dec 2015 08:53:00 -0500 Received: from mout.web.de ([212.227.17.11]:57626 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751666AbbLMNw6 (ORCPT ); Sun, 13 Dec 2015 08:52:58 -0500 Subject: [PATCH 1/7] staging: lustre: Delete unnecessary goto statements in six functions 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: <566D7830.9060000@users.sourceforge.net> Date: Sun, 13 Dec 2015 14:52:48 +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:iIkF7fQHr1xoI1QExqs8sSeEUt7RiU5O6ufWORD8BVHP1n+A4Nl mtxz0hJBb4HfSbXNw9HODVUC0BRLI8vSTCMSA97kGeCnF+8ecOC8w/+QcHNE4Yd5NITi8Gk XNva/O9O5n+E6QOrvAiUHO+AZ1YKUHchcaKGgSS45Y0bZFwSM+lOJorN+p0LDt/pxzIGQE+ BcN1sX5DuBauwaBdMjyTA== X-UI-Out-Filterresults: notjunk:1;V01:K0:ZX/g2BvnYh8=:hLyHB7F1jM4OAdKf1wnaTp IYPHPuiwEHvcAq+s4vtsPHPHuspFSXbo3HB+VygJg1ORRZ5yyELbQZ6NeRMxBL8Kum4k6iZp3 +8Nvl/oqotl+0Y397f6By+hACct5DrRFUL/ZM2v+tFufslkpvytyj81eTDfkYB25nhhmVzNBt CVdjW1TGDnRiuFmOQuV5FE3f35lSIV7Luql9hTZs4DoeKaGz6SYmelJU27e0w7llVxAhZvzH+ B4IGWVKosm0W8eCJQ61EaZ0XLm5jvlr3A+Z2gmnIgco5awbhW7YYt4WcuYPB8XnNR12F1Eiqy KqU2g2ghlSP1cclPV0eYw+WJOO05gTJcow0D0KvoHh6Y8azcR9ebjklg+WbXX1uBOzCerLQN+ 2SzmsDs4J6AoLujDGV13L1hXnvYmS4a+bdwX1YFcty56/UxuJl4njTdknQjI0KqvJfgWrbiY/ SHZlkCwOS3OR4UM8GQ8XJnWpovitRv7BgLud2Rq4mET/9MUqLcmVd6qA5AMBsiQBahE6bcJ7c 4Vuegzm6IOmTtAxjS1K7l8jh9R64lUIo8W9jP97CXtkiKQCwWqxLHOybKgaHy1UNpujDWq8jO qjz8faHWjdPQXDKXx2ONcbebV+WygXIsB7MPEVLLZzvatrooC5Jmu7JXo5ehHw/nSGdiQfeFH j4RKs0W2FxMkM9H+QioGcCpRT4HaHyECKaKxtjSTYIaEGzINwUvRSJuHBWI4+gh381v6nF/SJ rf+Ae5SNnMvFnzx4Qd23wX7D95xdfU9aeHKkT0C1fq4egO2Asxrz5HM3PoFWOC8z8cW8ZsS4K h173rZL Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sun, 13 Dec 2015 09:30:47 +0100 Six goto statements referred to a source code position directly behind them. Thus omit such unnecessary jumps. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/staging/lustre/lustre/llite/namei.c | 1 - drivers/staging/lustre/lustre/mdc/mdc_request.c | 7 ------- 2 files changed, 8 deletions(-) diff --git a/drivers/staging/lustre/lustre/llite/namei.c b/drivers/staging/lustre/lustre/llite/namei.c index 64db5e8..2113dd4 100644 --- a/drivers/staging/lustre/lustre/llite/namei.c +++ b/drivers/staging/lustre/lustre/llite/namei.c @@ -554,7 +554,6 @@ static struct dentry *ll_lookup_it(struct inode *parent, struct dentry *dentry, retval = NULL; else retval = dentry; - goto out; out: if (req) ptlrpc_req_finished(req); diff --git a/drivers/staging/lustre/lustre/mdc/mdc_request.c b/drivers/staging/lustre/lustre/mdc/mdc_request.c index 294c050..920b1e9 100644 --- a/drivers/staging/lustre/lustre/mdc/mdc_request.c +++ b/drivers/staging/lustre/lustre/mdc/mdc_request.c @@ -1181,7 +1181,6 @@ static int mdc_ioc_hsm_progress(struct obd_export *exp, ptlrpc_request_set_replen(req); rc = mdc_queue_wait(req); - goto out; out: ptlrpc_req_finished(req); return rc; @@ -1216,7 +1215,6 @@ static int mdc_ioc_hsm_ct_register(struct obd_import *imp, __u32 archives) ptlrpc_request_set_replen(req); rc = mdc_queue_wait(req); - goto out; out: ptlrpc_req_finished(req); return rc; @@ -1282,7 +1280,6 @@ static int mdc_ioc_hsm_ct_unregister(struct obd_import *imp) ptlrpc_request_set_replen(req); rc = mdc_queue_wait(req); - goto out; out: ptlrpc_req_finished(req); return rc; @@ -1362,8 +1359,6 @@ static int mdc_ioc_hsm_state_set(struct obd_export *exp, ptlrpc_request_set_replen(req); rc = mdc_queue_wait(req); - goto out; - out: ptlrpc_req_finished(req); return rc; @@ -1427,8 +1422,6 @@ static int mdc_ioc_hsm_request(struct obd_export *exp, ptlrpc_request_set_replen(req); rc = mdc_queue_wait(req); - goto out; - out: ptlrpc_req_finished(req); return rc; -- 2.6.3