From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161156AbcGZTMm (ORCPT ); Tue, 26 Jul 2016 15:12:42 -0400 Received: from mout.web.de ([212.227.15.4]:54860 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161084AbcGZTMh (ORCPT ); Tue, 26 Jul 2016 15:12:37 -0400 Subject: [PATCH 10/12] staging: lustre: Rename jump labels in mgc_process_recover_log() To: devel@driverdev.osuosl.org, lustre-devel@lists.lustre.org, Andreas Dilger , Greg Kroah-Hartman , Oleg Drokin References: <566ABCD9.1060404@users.sourceforge.net> <566D7733.1030102@users.sourceforge.net> <56784D83.7080108@users.sourceforge.net> <56784F0C.6040007@users.sourceforge.net> <20151221234857.GA27079@kroah.com> <59d94e70-7476-728e-5f63-013557ec2db9@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall , Bhumika Goyal From: SF Markus Elfring Message-ID: <7f6e1800-cb60-ef60-6f41-e883d75bea23@users.sourceforge.net> Date: Tue, 26 Jul 2016 21:12:22 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2 MIME-Version: 1.0 In-Reply-To: <59d94e70-7476-728e-5f63-013557ec2db9@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:p2So1CTqzff3YVF3Oj1nKeM7fPYwl63nJOjgUDbBR6K5X9C2y+j Xe1zq4B7wMLsr4oJWGGqQ6zo7PTEjHX9rEMoZ0Mwrrzq0fySu89OrC/DZeuPOoAfI5banqM 48tG1WeysFufhVjsJbiLBEjzLl0bp4ST/Nyt5QYpt27jtl/FMmYC2tRZdwmZxsv8eOZcHGZ 39wQZAUpJFR8kYsJPWslA== X-UI-Out-Filterresults: notjunk:1;V01:K0:sgDCy+V5SH0=:Pb64HNZAK+x6X9eClWr5Pt a5s9gtiDo9bhiqgDcMKnx6NLUeX7CDFuth7romxx5McCRYp3sRqfV1UZ07kY3STK1VjMEmjkA HPG5PrzkqrPRgqgIIINqdO8Ar8urNTFnvLYfaLUvGN7hNX66tuxYXEg4w1C+sqrch6bTDtCj6 s41NCRSm+3DJTd6rQtx7Sn6+mkGqDwvvLSGdXY5G9rX7W+i+gNplIxkYpbc1RFQ+A7Y4GTVhh AJOOLjiyqYA7HHPuTtnCWxwtfW67DM8rhoszDmHgj+Pv+aI8qjjyPeiG5IjX5WdrFzuvaGqvh jkXwlRkfunkQYQ0Vw+kANF+myO4z4bcheeR7OwoebApdKy6l2sH5GvnB4i3pBnQFkbDeM+gFH /RJsUoL8j2kIApokVdnzXGgeo2LiJMI7DdBQ7rph/z3/jGjrd/JBkX+4la1HQCvwdT7Fd8jxC frqGMWhvfQ5FT8iouuGaU0z26Xb1aq65cdumRWs0Qji6EvuSaPzUXu/d3ZRfStjsni1KWFqcV 5TVooZ3p4f1WsX/+GnQGXupXRRPUtVUr1d1S+ENezV8Ru5SzdPHf3fPROvPU/HrQGBCSPBCWY b3MwRlJRO94ePV2LOWtPkDTbXMcRMGcs4lXtxTx0pv+YFlArp/4HDldhzI2UNXLpsSoz4GjNC PpaZ7O+l66MocaUIQ966+J72PdOslaTOvhv3a123Ss6aH2qD7qTHXICmoBoFn1po5NiNE32+i S+ZalIf0EBW+GcG72gqfrWOey7UGRc8VwGg/gx24TtkQvAz4UOHxCyRumq/QD5DJoPNZlWEV7 5Fb67zn Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Tue, 26 Jul 2016 19:29:11 +0200 Adjust jump targets according to the Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/staging/lustre/lustre/mgc/mgc_request.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/drivers/staging/lustre/lustre/mgc/mgc_request.c b/drivers/staging/lustre/lustre/mgc/mgc_request.c index 2207af7..ff60b9b 100644 --- a/drivers/staging/lustre/lustre/mgc/mgc_request.c +++ b/drivers/staging/lustre/lustre/mgc/mgc_request.c @@ -1362,7 +1362,7 @@ again: rc = ptlrpc_request_pack(req, LUSTRE_MGS_VERSION, MGS_CONFIG_READ); if (rc) - goto out; + goto finish_request; /* pack request */ body = req_capsule_client_get(&req->rq_pill, &RMF_MGS_CONFIG_BODY); @@ -1370,7 +1370,7 @@ again: if (strlcpy(body->mcb_name, cld->cld_logname, sizeof(body->mcb_name)) >= sizeof(body->mcb_name)) { rc = -E2BIG; - goto out; + goto finish_request; } body->mcb_offset = cfg->cfg_last_idx + 1; body->mcb_type = cld->cld_type; @@ -1382,7 +1382,7 @@ again: MGS_BULK_PORTAL); if (!desc) { rc = -ENOMEM; - goto out; + goto finish_request; } for (i = 0; i < nrpages; i++) @@ -1391,12 +1391,12 @@ again: ptlrpc_request_set_replen(req); rc = ptlrpc_queue_wait(req); if (rc) - goto out; + goto finish_request; res = req_capsule_server_get(&req->rq_pill, &RMF_MGS_CONFIG_RES); if (res->mcr_size < res->mcr_offset) { rc = -EINVAL; - goto out; + goto finish_request; } /* always update the index even though it might have errors with @@ -1411,18 +1411,18 @@ again: ealen = sptlrpc_cli_unwrap_bulk_read(req, req->rq_bulk, 0); if (ealen < 0) { rc = ealen; - goto out; + goto finish_request; } if (ealen > nrpages << PAGE_SHIFT) { rc = -EINVAL; - goto out; + goto finish_request; } if (ealen == 0) { /* no logs transferred */ if (!eof) rc = -EINVAL; - goto out; + goto finish_request; } mne_swab = !!ptlrpc_rep_need_swab(req); @@ -1453,8 +1453,7 @@ again: ealen -= PAGE_SIZE; } - -out: +finish_request: ptlrpc_req_finished(req); if (rc == 0 && !eof) -- 2.9.2 From mboxrd@z Thu Jan 1 00:00:00 1970 From: SF Markus Elfring Date: Tue, 26 Jul 2016 19:12:22 +0000 Subject: [PATCH 10/12] staging: lustre: Rename jump labels in mgc_process_recover_log() Message-Id: <7f6e1800-cb60-ef60-6f41-e883d75bea23@users.sourceforge.net> List-Id: References: <566ABCD9.1060404@users.sourceforge.net> <566D7733.1030102@users.sourceforge.net> <56784D83.7080108@users.sourceforge.net> <56784F0C.6040007@users.sourceforge.net> <20151221234857.GA27079@kroah.com> <59d94e70-7476-728e-5f63-013557ec2db9@users.sourceforge.net> In-Reply-To: <59d94e70-7476-728e-5f63-013557ec2db9@users.sourceforge.net> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: devel@driverdev.osuosl.org, lustre-devel@lists.lustre.org, Andreas Dilger , Greg Kroah-Hartman , Oleg Drokin Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall , Bhumika Goyal From: Markus Elfring Date: Tue, 26 Jul 2016 19:29:11 +0200 Adjust jump targets according to the Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/staging/lustre/lustre/mgc/mgc_request.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/drivers/staging/lustre/lustre/mgc/mgc_request.c b/drivers/staging/lustre/lustre/mgc/mgc_request.c index 2207af7..ff60b9b 100644 --- a/drivers/staging/lustre/lustre/mgc/mgc_request.c +++ b/drivers/staging/lustre/lustre/mgc/mgc_request.c @@ -1362,7 +1362,7 @@ again: rc = ptlrpc_request_pack(req, LUSTRE_MGS_VERSION, MGS_CONFIG_READ); if (rc) - goto out; + goto finish_request; /* pack request */ body = req_capsule_client_get(&req->rq_pill, &RMF_MGS_CONFIG_BODY); @@ -1370,7 +1370,7 @@ again: if (strlcpy(body->mcb_name, cld->cld_logname, sizeof(body->mcb_name)) >= sizeof(body->mcb_name)) { rc = -E2BIG; - goto out; + goto finish_request; } body->mcb_offset = cfg->cfg_last_idx + 1; body->mcb_type = cld->cld_type; @@ -1382,7 +1382,7 @@ again: MGS_BULK_PORTAL); if (!desc) { rc = -ENOMEM; - goto out; + goto finish_request; } for (i = 0; i < nrpages; i++) @@ -1391,12 +1391,12 @@ again: ptlrpc_request_set_replen(req); rc = ptlrpc_queue_wait(req); if (rc) - goto out; + goto finish_request; res = req_capsule_server_get(&req->rq_pill, &RMF_MGS_CONFIG_RES); if (res->mcr_size < res->mcr_offset) { rc = -EINVAL; - goto out; + goto finish_request; } /* always update the index even though it might have errors with @@ -1411,18 +1411,18 @@ again: ealen = sptlrpc_cli_unwrap_bulk_read(req, req->rq_bulk, 0); if (ealen < 0) { rc = ealen; - goto out; + goto finish_request; } if (ealen > nrpages << PAGE_SHIFT) { rc = -EINVAL; - goto out; + goto finish_request; } if (ealen = 0) { /* no logs transferred */ if (!eof) rc = -EINVAL; - goto out; + goto finish_request; } mne_swab = !!ptlrpc_rep_need_swab(req); @@ -1453,8 +1453,7 @@ again: ealen -= PAGE_SIZE; } - -out: +finish_request: ptlrpc_req_finished(req); if (rc = 0 && !eof) -- 2.9.2 From mboxrd@z Thu Jan 1 00:00:00 1970 From: SF Markus Elfring Date: Tue, 26 Jul 2016 21:12:22 +0200 Subject: [lustre-devel] [PATCH 10/12] staging: lustre: Rename jump labels in mgc_process_recover_log() In-Reply-To: <59d94e70-7476-728e-5f63-013557ec2db9@users.sourceforge.net> References: <566ABCD9.1060404@users.sourceforge.net> <566D7733.1030102@users.sourceforge.net> <56784D83.7080108@users.sourceforge.net> <56784F0C.6040007@users.sourceforge.net> <20151221234857.GA27079@kroah.com> <59d94e70-7476-728e-5f63-013557ec2db9@users.sourceforge.net> Message-ID: <7f6e1800-cb60-ef60-6f41-e883d75bea23@users.sourceforge.net> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: devel@driverdev.osuosl.org, lustre-devel@lists.lustre.org, Andreas Dilger , Greg Kroah-Hartman , Oleg Drokin Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall , Bhumika Goyal From: Markus Elfring Date: Tue, 26 Jul 2016 19:29:11 +0200 Adjust jump targets according to the Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/staging/lustre/lustre/mgc/mgc_request.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/drivers/staging/lustre/lustre/mgc/mgc_request.c b/drivers/staging/lustre/lustre/mgc/mgc_request.c index 2207af7..ff60b9b 100644 --- a/drivers/staging/lustre/lustre/mgc/mgc_request.c +++ b/drivers/staging/lustre/lustre/mgc/mgc_request.c @@ -1362,7 +1362,7 @@ again: rc = ptlrpc_request_pack(req, LUSTRE_MGS_VERSION, MGS_CONFIG_READ); if (rc) - goto out; + goto finish_request; /* pack request */ body = req_capsule_client_get(&req->rq_pill, &RMF_MGS_CONFIG_BODY); @@ -1370,7 +1370,7 @@ again: if (strlcpy(body->mcb_name, cld->cld_logname, sizeof(body->mcb_name)) >= sizeof(body->mcb_name)) { rc = -E2BIG; - goto out; + goto finish_request; } body->mcb_offset = cfg->cfg_last_idx + 1; body->mcb_type = cld->cld_type; @@ -1382,7 +1382,7 @@ again: MGS_BULK_PORTAL); if (!desc) { rc = -ENOMEM; - goto out; + goto finish_request; } for (i = 0; i < nrpages; i++) @@ -1391,12 +1391,12 @@ again: ptlrpc_request_set_replen(req); rc = ptlrpc_queue_wait(req); if (rc) - goto out; + goto finish_request; res = req_capsule_server_get(&req->rq_pill, &RMF_MGS_CONFIG_RES); if (res->mcr_size < res->mcr_offset) { rc = -EINVAL; - goto out; + goto finish_request; } /* always update the index even though it might have errors with @@ -1411,18 +1411,18 @@ again: ealen = sptlrpc_cli_unwrap_bulk_read(req, req->rq_bulk, 0); if (ealen < 0) { rc = ealen; - goto out; + goto finish_request; } if (ealen > nrpages << PAGE_SHIFT) { rc = -EINVAL; - goto out; + goto finish_request; } if (ealen == 0) { /* no logs transferred */ if (!eof) rc = -EINVAL; - goto out; + goto finish_request; } mne_swab = !!ptlrpc_rep_need_swab(req); @@ -1453,8 +1453,7 @@ again: ealen -= PAGE_SIZE; } - -out: +finish_request: ptlrpc_req_finished(req); if (rc == 0 && !eof) -- 2.9.2