From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932478AbcGZTHO (ORCPT ); Tue, 26 Jul 2016 15:07:14 -0400 Received: from mout.web.de ([212.227.15.3]:61829 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932258AbcGZTHK (ORCPT ); Tue, 26 Jul 2016 15:07:10 -0400 Subject: [PATCH 06/12] staging: lustre: Return directly after a failed kcalloc() 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: <8484b472-20b6-e8ca-b18e-a3d2976d4c28@users.sourceforge.net> Date: Tue, 26 Jul 2016 21:07:02 +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:Fa278p9SxDJdN78wNgzfoaXhuSNUM29rTR4KuvyRxvnJ/gPgJxO mRM2ZxYP9o3h4PmWlN/XrIlbkmBLQFzyMmdmnBDP2o69RF7a6y1MtXmg6I7gg4zYeO+Hl+w LJgcR0GClAhaoZPeMakfNy5gBgSd3hyYbCemO9WFEfYpgiCDPRzF1jPneB46SON/J0wSU9o zfYxlxG6Yrqq7kEoyHyMw== X-UI-Out-Filterresults: notjunk:1;V01:K0:Pzf+RKWF1B8=:I+3U/jYmCLOWwGryfUnxuv mcTCZKm9m65mlXXOJS7SF4ztt08rdLzIhnS3SFhBU+bWoJLksOdxv1wyMsrpI7MXK00023CEt mIOKzNA68AjP9KDRnd82XqDY4pWL0S3N7w0CqZf4r9WyA5/0tiYtFef6yZt0BqSX7FYHshc9m Ma8orQ6e02dcw+koCanUU4NHdZHnnHthc0BI2ex/J504ZGJb8dKFWR97ffS2tJb651Jc6d8xL +bHbU1dsntLpaJmPk9/SvFQNWYVu3Hv/wHNwKUdOQtd7v8c1aJO2Q0bAsolfLYLnayz3YnfGf tBuFxIGksHCY2nklKKcR9/RGPhAQRU2kUSp5c0+H+99DhMSvFCnwRcSniRSuRjSmfFk2rSlai 0SXflUl+99HW7OQrfhpVG+OzuYjqkrdD5Ss5T3Qw0rvkzXsLhSWtquJt/UMihaff8xPK5xljo tbdXiyloiS45tS3dGdIU149Vo3ooFZAtxYQmKQXkCmALhFGWhV7IDU6HK799zRhKlZeLMSBQm xYlJXfy372Ip3PcMNL1ugHUO9zbXJZ5ICuRL4aTlkgzuHVoCrvVBomfsldRZRvcKx14WeWpJa YYqcM2nAFDF1sjtqIY3Jio40mjya6MLoFmoHtvxff3pSUSm3LR++Packa/brF5YqlKtLZpsW+ 8uBv0pb3tDXYnAk2JZx5GN7a1T9ejvGNVSV2gcLNfRXCdFB2sENdunq7FcgkA9fH4ta0nV0yf ZyPCVbB7GbE8WGTSw0GdWd+U8aYxPcN9C97K2r3veGi7vpW2Ln2ycSMzvhPa6QBgCEvo0g5LN gKhNj9k 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 16:32:31 +0200 Return directly after a memory allocation failed at the beginning. Signed-off-by: Markus Elfring --- drivers/staging/lustre/lustre/mgc/mgc_request.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/staging/lustre/lustre/mgc/mgc_request.c b/drivers/staging/lustre/lustre/mgc/mgc_request.c index 9d0bd47..d716bb2 100644 --- a/drivers/staging/lustre/lustre/mgc/mgc_request.c +++ b/drivers/staging/lustre/lustre/mgc/mgc_request.c @@ -1339,10 +1339,8 @@ static int mgc_process_recover_log(struct obd_device *obd, nrpages = CONFIG_READ_NRPAGES_INIT; pages = kcalloc(nrpages, sizeof(*pages), GFP_KERNEL); - if (!pages) { - rc = -ENOMEM; - goto out; - } + if (!pages) + return -ENOMEM; for (i = 0; i < nrpages; i++) { pages[i] = alloc_page(GFP_KERNEL); -- 2.9.2 From mboxrd@z Thu Jan 1 00:00:00 1970 From: SF Markus Elfring Date: Tue, 26 Jul 2016 19:07:02 +0000 Subject: [PATCH 06/12] staging: lustre: Return directly after a failed kcalloc() in mgc_process_recover_log() Message-Id: <8484b472-20b6-e8ca-b18e-a3d2976d4c28@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 16:32:31 +0200 Return directly after a memory allocation failed at the beginning. Signed-off-by: Markus Elfring --- drivers/staging/lustre/lustre/mgc/mgc_request.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/staging/lustre/lustre/mgc/mgc_request.c b/drivers/staging/lustre/lustre/mgc/mgc_request.c index 9d0bd47..d716bb2 100644 --- a/drivers/staging/lustre/lustre/mgc/mgc_request.c +++ b/drivers/staging/lustre/lustre/mgc/mgc_request.c @@ -1339,10 +1339,8 @@ static int mgc_process_recover_log(struct obd_device *obd, nrpages = CONFIG_READ_NRPAGES_INIT; pages = kcalloc(nrpages, sizeof(*pages), GFP_KERNEL); - if (!pages) { - rc = -ENOMEM; - goto out; - } + if (!pages) + return -ENOMEM; for (i = 0; i < nrpages; i++) { pages[i] = alloc_page(GFP_KERNEL); -- 2.9.2 From mboxrd@z Thu Jan 1 00:00:00 1970 From: SF Markus Elfring Date: Tue, 26 Jul 2016 21:07:02 +0200 Subject: [lustre-devel] [PATCH 06/12] staging: lustre: Return directly after a failed kcalloc() 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: <8484b472-20b6-e8ca-b18e-a3d2976d4c28@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 16:32:31 +0200 Return directly after a memory allocation failed at the beginning. Signed-off-by: Markus Elfring --- drivers/staging/lustre/lustre/mgc/mgc_request.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/staging/lustre/lustre/mgc/mgc_request.c b/drivers/staging/lustre/lustre/mgc/mgc_request.c index 9d0bd47..d716bb2 100644 --- a/drivers/staging/lustre/lustre/mgc/mgc_request.c +++ b/drivers/staging/lustre/lustre/mgc/mgc_request.c @@ -1339,10 +1339,8 @@ static int mgc_process_recover_log(struct obd_device *obd, nrpages = CONFIG_READ_NRPAGES_INIT; pages = kcalloc(nrpages, sizeof(*pages), GFP_KERNEL); - if (!pages) { - rc = -ENOMEM; - goto out; - } + if (!pages) + return -ENOMEM; for (i = 0; i < nrpages; i++) { pages[i] = alloc_page(GFP_KERNEL); -- 2.9.2