From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752014AbbGENax (ORCPT ); Sun, 5 Jul 2015 09:30:53 -0400 Received: from mout.web.de ([212.227.17.12]:60560 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750965AbbGENaw (ORCPT ); Sun, 5 Jul 2015 09:30:52 -0400 Message-ID: <55993170.6060306@users.sourceforge.net> Date: Sun, 05 Jul 2015 15:30:24 +0200 From: SF Markus Elfring User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Joel Becker , Mark Fasheh , ocfs2-devel@oss.oracle.com CC: LKML , kernel-janitors@vger.kernel.org, Julia Lawall Subject: [PATCH 03/11] ocfs2: Less checks in ocfs2_rename() after error detection References: <5307CAA2.8060406@users.sourceforge.net> <530A086E.8010901@users.sourceforge.net> <530A72AA.3000601@users.sourceforge.net> <530B5FB6.6010207@users.sourceforge.net> <530C5E18.1020800@users.sourceforge.net> <530CD2C4.4050903@users.sourceforge.net> <530CF8FF.8080600@users.sourceforge.net> <530DD06F.4090703@users.sourceforge.net> <5317A59D.4@users.sourceforge.net> <5455FC05.4010606@users.sourceforge.net> <55992DF0.5030205@users.sourceforge.net> In-Reply-To: <55992DF0.5030205@users.sourceforge.net> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:pMctOc2+VT3TqNwsPGRTY87to01CIVm3yMT6VUGVDnIOhEUnYEV cXp+964YAbQ4AlqJdbXRGWXZyKcGyhUFtZxAgacdPFNMI/8oa8hgbEPeVZWrCg/pxnuau4X tja6VGOzy7HelZna4XJbdutSHUC4HJzOt6dRAgUEKjPGgBJ3iAQD3U7F5BHeiypSYFteBq1 whe2tZQNfwFkCuazhy1Yw== X-UI-Out-Filterresults: notjunk:1;V01:K0:Jf7wAunnpfw=:9lBmJft3VnOawMldFxdcZf 0bxwyJExUmuHqUg/Ty+dYPcQ7aJswdpwAuAgGnG2APeMJk2ccoGy+V/ZegLUZc218sIJsEpgG 65zz5x+WV1K/6kPAh+o2iPvaGJCzqO8qz6hGzRs9g8hTWB6lQnvo8h6UnmffKs7aS5XjeNFUE 0mmpxLMBzOyUcoYGZVhkSymJ9TUjIwO74LoOzx90TF0RDQpbRr3wYqFqg7R/LM489RIM5o9jP u+K4PWlEbBrH8GDOfihyKdo7dr3TQgUOySfrrdEqGWFewEwrSUCTjeH1PCyXryoGzk7jX8o7n uxuKxLb7Duks5Y/T2D8IW+T9BV4EbBpGJUvg36+vPGCr4PLRW34kSYYQ4qzJkbG2R7GXD+mZ6 Lo70Pm8eOw8fWB198BsSUxdtq8J9fijy3hK9nxsf96OVzt4PXT0mAUIVVyqbHQp2ZL4uzzqcR 0kvgpJZxFkmFjths+GUXPYUhc7XQfhZ02paUuhqBykWEDG8hiaZYlvu85IUrkxW42MLLFfld9 yUYZ5oKO7b4F62HUkLhxwW/k1J9r3An9JBfA3ZXQ8g+8AgW6UHhWxr76ydH4nuovxpRPnDs0v /yBjrjPIvOHSRRV7OFg1IU1D2TXiXCkUad120rlIHiklDErqFwtRinWP7FAg/uKE9N4x8XCmO VbGBqOaOqGJrmAHzNnuXX9r4G1j0F5sJGPwHIevdpLZapylvB6C4DoPi/z37tBB4EaEE= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sat, 4 Jul 2015 15:30:18 +0200 Skip checks for a few variables in three error handling cases within the ocfs2_rename() function by adjustment of a few jump targets according to the Linux coding style convention. Signed-off-by: Markus Elfring --- fs/ocfs2/namei.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c index a04d70b..04a61cb 100644 --- a/fs/ocfs2/namei.c +++ b/fs/ocfs2/namei.c @@ -1255,7 +1255,7 @@ static int ocfs2_rename(struct inode *old_dir, status = ocfs2_rename_lock(osb); if (status < 0) { mlog_errno(status); - goto bail; + goto basic_clean_up; } rename_lock = 1; @@ -1265,13 +1265,13 @@ static int ocfs2_rename(struct inode *old_dir, old_inode->i_ino); if (status < 0) { mlog_errno(status); - goto bail; + goto rename_unlock; } else if (status == 1) { status = -EPERM; trace_ocfs2_rename_not_permitted( (unsigned long long)old_inode->i_ino, (unsigned long long)new_dir->i_ino); - goto bail; + goto rename_unlock; } } @@ -1630,9 +1630,10 @@ static int ocfs2_rename(struct inode *old_dir, ocfs2_dentry_move(old_dentry, new_dentry, old_dir, new_dir); status = 0; bail: - if (rename_lock) + if (rename_lock) { +rename_unlock: ocfs2_rename_unlock(osb); - + } if (handle) ocfs2_commit_trans(osb, handle); @@ -1651,7 +1652,7 @@ bail: mutex_unlock(&orphan_dir->i_mutex); iput(orphan_dir); } - +basic_clean_up: if (new_inode) sync_mapping_buffers(old_inode->i_mapping); -- 2.4.5