From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752376AbbGENcd (ORCPT ); Sun, 5 Jul 2015 09:32:33 -0400 Received: from mout.web.de ([212.227.17.11]:50825 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750841AbbGENcZ (ORCPT ); Sun, 5 Jul 2015 09:32:25 -0400 Message-ID: <559931E5.1020704@users.sourceforge.net> Date: Sun, 05 Jul 2015 15:32:21 +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 04/11] ocfs2: One check less in ocfs2_statfs() 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:thQJ4OPHXTXSKTJ9amJTG1TwDkGBcYgcvijORZV77O+eym2etxk TGXHuumpnM9/sByLtyJbasz/EW/oM6jvbs1feMeJA295cR3x8D9fsjrwZK42s5AQZNnj+2L 1NdtNU3hEZp/q/qo862A6f/aX4SNg6qDBOOS+Gb5/do2C+TreoG/qUqsfvc633kMnY3fOSQ eZ4VU4oTk9j7FqbnTQ7Nw== X-UI-Out-Filterresults: notjunk:1;V01:K0:Jk9GU/fGl1Q=:lE0wYtYIWE+4M2Va1eI1p8 Nu/kxuTD/e0w324d4QGA5zRElIfER/lYgeI7jPAw6epWcc/Z8lZnVvtHez/w9JDCOh0SOVyu6 lshdp19y8Q8huPwSMV+YYxgUyd1TicWBFwzdg95QXcRQSWWk4O72b7pkP8Y2py5ohR0sS3aSh SyJ868+c8ACrRJ1zHEhYjwux1HBqrBO6t7tjwHf5LAsJykMploGtYZeYo4KJjlhG5NmXJdGqc MHHvaPMn4U2G86yzDOEVBEcQ/iA5O3k23BJIeLb1q7wDlBObf895r9qgwg+WCNHGHL2YWvljf gNb9Wa13cUweboQ87TBTimwAm+eJrgO0BByzjjUPUNjq3NkBjYae/LbTjlNzzn5G86pYCfLf6 +I6F7uDKVOy4YYaBnbaHrgyBIRrsl/Hf3B96vfLIp3W5Djzi1FxrxhU3E0k3u7iVAQ6ZT8ezk H8XRAvES7FQFKBXI/qLIcnafpJyfYSbpqrlwK7BUpI/BjWLZTp5Pv6CzoG407Jbf8gPDbvLbE JvE3PmA5sDC9BW7Ln6g6xiQYfFRAKXgAtoJzq65uLjh722qfiNbbZg5qproJ27BHR63pwzLDB iktxTfhNMYhEFiEn8q+APGPRWyma5Q2/HuMo8KDtLjnDD5r9aeRJNa8VqaQYqOlcAA/5MajjC v3TVEmp9MBSAzfMYzjue+9u16JakqkY0NnulccPbDwsYtFaXtbeXM+kjH1j/B0EmNN30= 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 16:28:50 +0200 Delete a check for the variable "status" by adjustment of two jump targets according to the Linux coding style convention. Separate the exception handling statements from the ordinary execution path. Signed-off-by: Markus Elfring --- fs/ocfs2/super.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c index 37e418f..ed16f08 100644 --- a/fs/ocfs2/super.c +++ b/fs/ocfs2/super.c @@ -1692,14 +1692,12 @@ static int ocfs2_statfs(struct dentry *dentry, struct kstatfs *buf) if (!inode) { mlog(ML_ERROR, "failed to get bitmap inode\n"); status = -EIO; - goto bail; + goto log_error; } status = ocfs2_inode_lock(inode, &bh, 0); - if (status < 0) { - mlog_errno(status); - goto bail; - } + if (status < 0) + goto put_inode; bm_lock = (struct ocfs2_dinode *) bh->b_data; @@ -1724,13 +1722,12 @@ static int ocfs2_statfs(struct dentry *dentry, struct kstatfs *buf) brelse(bh); ocfs2_inode_unlock(inode, 0); - status = 0; -bail: iput(inode); - - if (status) - mlog_errno(status); - + return 0; +put_inode: + iput(inode); +log_error: + mlog_errno(status); return status; } -- 2.4.5