From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751703AbbLUTJV (ORCPT ); Mon, 21 Dec 2015 14:09:21 -0500 Received: from mout.web.de ([212.227.15.14]:64775 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751415AbbLUTJS (ORCPT ); Mon, 21 Dec 2015 14:09:18 -0500 Subject: [PATCH v2 1/4] staging: lustre: Delete unnecessary goto statements in six functions To: lustre-devel@lists.lustre.org, devel@driverdev.osuosl.org, Andreas Dilger , Greg Kroah-Hartman , Oleg Drokin References: <566ABCD9.1060404@users.sourceforge.net> <566D7733.1030102@users.sourceforge.net> <56784D83.7080108@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: <56784E50.7040806@users.sourceforge.net> Date: Mon, 21 Dec 2015 20:09:04 +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: <56784D83.7080108@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:ZG0eyylkAN38JFa8QmFZOD7iV+McXgsGlQUtiUplUr1/QcFFP4q fzkn2yLKxCdQH8t6BXqgTxgR5QZ7sEzb43kzO/9JWKOIj0Tz152mQTCRcgrlH5bdNi/R0VV uAN2b4MrmBYCxusvUT/2++NsjQND6FRndAQBC5i8DLTBj/NdcpUS5MCvdgIouzmxtEeksT1 WcEVtD2V1ODVt1tt6wsjg== X-UI-Out-Filterresults: notjunk:1;V01:K0:PukWjyShP3Q=:AMoR/uk4VvJDktfv2E+fCt n1REi/ZuwXYLejiNTcKcX/QZMsAf4A9hc5IrDyERp8pKmu+TdUYngmiO8vWN/WYZ93+uLkJdy 4vlt8lxHOIteq06i5T7INfQw53x2fJw01y1LCaYqfRZetLtD2YsdY8EFsY3bzIsWfBsVa/EHF XaHQZq1BNXbDPS6EnQ+eOoIyOeNWG9kja7e0SzP5sYploo6qV/2l1NyKCLPq1SReKdKNkwRrS 7JSPDDmEokivo6kRYljSjXuPx/EUwqHcflt5Av9wKig4ndrDy0UQBfcIH946696EdhtXfCSmF I9ucgKRtp9dVb9jm2YzOart0VnZAu1hUHJencFbk4Z+7XUIcUdIfoAHUpn6IOQVLrtQZlZ8FJ nC1VWXRmls/N8E7MyqE4f1lI8W/t8GKhN6v6bsnMo7rm20b+GjAdgVRn8PkGXPcHtmQqUl1cQ cSQ/Y23yXWnQQMwWEr96UK8E0tYqTeFOD3Z/IsV5ZUccygoz3LFcVuShVD+WfRj+XJ7dgrjbm bQIR/VAWWqENnwKoG+Oo0YIkT4dJEEJUkqMT1yyLYjDNlBFBde9PB7Z8upd0Gn47Ad6d/3B5V 9EZnFddXa1j3w/Pk6AN1cRFgkrMumojjVOdoRBT8SpV7hsl0xpIwHx66BQqrbWoduIgSd2bMY XQee6AM3jJAXh/4yT8AnvVnZAeVTvPJ+hBdqoia0+JUcSkrwOYNkzwleqLwoy5d5Ao/Qa2caG 28FWl5v6VWrP46xX15goOpj4e5hYCpLzK2IWn7nxifj2yfXb9FfJn5AIbDOKA/dKOqMrRUw+X GBrTv/N Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Mon, 21 Dec 2015 18:15:45 +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