From patchwork Thu Nov 16 00:46:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 10060537 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B9467604D4 for ; Thu, 16 Nov 2017 00:47:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A374F2A3EE for ; Thu, 16 Nov 2017 00:47:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 985DD2A400; Thu, 16 Nov 2017 00:47:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from userp1040.oracle.com (userp1040.oracle.com [156.151.31.81]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 884AF2A3FC for ; Thu, 16 Nov 2017 00:47:30 +0000 (UTC) Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id vAG0lE2X029703 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 16 Nov 2017 00:47:14 GMT Received: from oss.oracle.com (oss-old-reserved.oracle.com [137.254.22.2]) by userv0022.oracle.com (8.14.4/8.14.4) with ESMTP id vAG0lCcW014845 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 16 Nov 2017 00:47:13 GMT Received: from localhost ([127.0.0.1] helo=lb-oss.oracle.com) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1eF8Km-00038b-6Z; Wed, 15 Nov 2017 16:47:12 -0800 Received: from userv0021.oracle.com ([156.151.31.71]) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1eF8KN-00037o-0d for ocfs2-devel@oss.oracle.com; Wed, 15 Nov 2017 16:46:47 -0800 Received: from userp2040.oracle.com (userp2040.oracle.com [156.151.31.90]) by userv0021.oracle.com (8.14.4/8.14.4) with ESMTP id vAG0kkPA013435 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO) for ; Thu, 16 Nov 2017 00:46:46 GMT Received: from pps.filterd (userp2040.oracle.com [127.0.0.1]) by userp2040.oracle.com (8.16.0.21/8.16.0.21) with SMTP id vAG0g6PV001930 for ; Thu, 16 Nov 2017 00:46:46 GMT Authentication-Results: oracle.com; spf=pass smtp.mailfrom=akpm@linux-foundation.org Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) by userp2040.oracle.com with ESMTP id 2e8yx28h1u-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 16 Nov 2017 00:46:46 +0000 Received: from akpm3.svl.corp.google.com (unknown [104.133.9.92]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 5C184BC2; Thu, 16 Nov 2017 00:46:44 +0000 (UTC) Date: Wed, 15 Nov 2017 16:46:42 -0800 From: Andrew Morton To: Changwei Ge Message-Id: <20171115164642.b1437a59be5bd46a4e6d258e@linux-foundation.org> In-Reply-To: <63ADC13FD55D6546B7DECE290D39E373CED7B2EF@H3CMLB14-EX.srv.huawei-3com.com> References: <71604351584F6A4EBAE558C676F37CA4F3CDE3A9@H3CMLB14-EX.srv.huawei-3com.com> <63ADC13FD55D6546B7DECE290D39E373CED7B2EF@H3CMLB14-EX.srv.huawei-3com.com> X-Mailer: Sylpheed 3.4.1 (GTK+ 2.24.23; x86_64-pc-linux-gnu) X-CLX-Shades: MLX X-CLX-Response: 1TFkXGB4TEQpMehcaEQpZTRdnZnIRCllJFxpxGhAadwYYGBNxGRMbEBp3Bhg aBhoRClleF2hjeREKSUYXRVhLSUZPdVpYRU5fSV5DRUQZdU9LEQpDThdzQGdGTFhaRXBvYlN9GW 0eYk9pc0JNWVB+eG8cY3lsYxEKWFwXHwQaBBsbEwcbSBpOGE5LTwUbGgQbGhoEHhIEGxAbHhofG hEKXlkXeHtFeXgRCk1cFxweHxEKTFoXeGlNTVMRCkVZF2xrEQpMXxd6BQUFBQUFBQUFbxEKTEYX bGtrEQpDWhcbHhoEGBsbBBscEwQbGBEKQl4XGxEKREkXHREKQkYXYlBQfElAfl9STmIRCkJcFxo RCkJFF215WkB/HlNvH2FiEQpCThdvb2ViHHIFZmZeYREKQkwXa3x/YEUYbHNlGmQRCkJsF24SWH 16T09vXUwfEQpCQBdgHlteX09FGQVCZREKQlgXYn1veQFPGBlwcHsRClpYFxgRCnBnF29hHFlnU h96EmwYEBkaEQpwaBdmZ1t9aVoTEx5IbhAZGhEKcGgXbFBbGVB6UGVmeUMQGhEKcGgXZ0hmUkEf Rk5HTBMQGRoRCnBoF2Z9QgFwZW99fUtZEBkaEQpwaBdvSGlNaXkTEkFYchAaEQpwZxduWF9wZXJ sXnlzEhAaEQpwZxdsAVpsblhMcHhLSRAZGhEKcGcXZxxYfEtLfmd6e1AQGRoRCnBsF2ZOZF1FQm xaZWRGEBIfEQpwQxdsXWBCfUNzXm5nHhAZGhEKbX4XGhEKWE0XSxEg MIME-Version: 1.0 X-PDR: PASS X-ServerName: mail.linuxfoundation.org X-Proofpoint-SPF-Result: pass X-Proofpoint-SPF-Record: v=spf1 ip4:140.211.169.12/30 include:_spf.google.com ~all X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8716 signatures=668617 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=0 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=249 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1709140000 definitions=main-1711160006 Cc: Guozhonghua , "ocfs2-devel@oss.oracle.com" Subject: Re: [Ocfs2-devel] [PATCH] ocfs2: The goto is not useful in the function ocfs2_reserve_cluster_bitmap_bits, so remove it. X-BeenThere: ocfs2-devel@oss.oracle.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: ocfs2-devel-bounces@oss.oracle.com Errors-To: ocfs2-devel-bounces@oss.oracle.com X-Source-IP: userv0022.oracle.com [156.151.31.74] X-Virus-Scanned: ClamAV using ClamSMTP On Thu, 16 Nov 2017 00:42:09 +0000 Changwei Ge wrote: > Hi Zhonghua, > On 2017/11/15 20:04, Guozhonghua wrote: > > The goto is not useful anymore, removed from the context. > > Perhaps we can make this change-log more clear like: > The bail declare is not necessary any more, so trim it. If code path > falls into error branch, ocfs2_reserve_cluster_bitmap_bits will return > in next following step, too. > > And this title can be changed into 'ocfs2: clean up unnecessary bail > declare' > > I suppose after that this patch will be neater. > > Can you resend this patch? > Moreover, I think we should also CC this patch to OCFS2 maintainers. The patch is OK. I reworked it as below. It's so obvious that no changelog is needed. From: Guozhonghua Subject: ocfs2: remove unneeded goto in ocfs2_reserve_cluster_bitmap_bits() Link: https://urldefense.proofpoint.com/v2/url?u=http-3A__lkml.kernel.org_r_71604351584F6A4EBAE558C676F37CA4F3CDE3A9-40H3CMLB14-2DEX.srv.huawei-2D3com.com&d=DwICAg&c=RoP1YumCXCgaWHvlZYR8PZh8Bv7qIrMUB65eapI_JnE&r=C7gAd4uDxlAvTdc0vmU6X8CMk6L2iDY8-HD0qT6Fo7Y&m=lcqqp5PvLSjaJ5MT6uqUC9J6gAhx8KP5Fd62d4ii4BA&s=KqlZy8JoC39DDT5b_TM6C12Vtg7AZhEE0QsYSC9ZJ30&e= Signed-off-by: guozhonghua Cc: Mark Fasheh Cc: Joel Becker Cc: Junxiao Bi Cc: Joseph Qi Signed-off-by: Andrew Morton --- fs/ocfs2/suballoc.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff -puN fs/ocfs2/suballoc.c~ocfs2-the-goto-is-not-useful-in-the-function-ocfs2_reserve_cluster_bitmap_bits-so-remove-it fs/ocfs2/suballoc.c --- a/fs/ocfs2/suballoc.c~ocfs2-the-goto-is-not-useful-in-the-function-ocfs2_reserve_cluster_bitmap_bits-so-remove-it +++ a/fs/ocfs2/suballoc.c @@ -1147,12 +1147,9 @@ int ocfs2_reserve_cluster_bitmap_bits(st GLOBAL_BITMAP_SYSTEM_INODE, OCFS2_INVALID_SLOT, NULL, ALLOC_NEW_GROUP); - if (status < 0 && status != -ENOSPC) { + if (status < 0 && status != -ENOSPC) mlog_errno(status); - goto bail; - } -bail: return status; }