From mboxrd@z Thu Jan 1 00:00:00 1970 From: Francis Moreau Subject: [PATCH] ext2_free_inode(): remove useless call to brelse() Date: Fri, 26 Mar 2010 14:07:00 +0100 Message-ID: <38b2ab8a1003260607p42382139te0be1a4ba4b3b8bc@mail.gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 To: linux-fsdevel@vger.kernel.org Return-path: Received: from mail-fx0-f223.google.com ([209.85.220.223]:39984 "EHLO mail-fx0-f223.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752894Ab0CZNHB (ORCPT ); Fri, 26 Mar 2010 09:07:01 -0400 Received: by fxm23 with SMTP id 23so2097461fxm.21 for ; Fri, 26 Mar 2010 06:07:00 -0700 (PDT) Sender: linux-fsdevel-owner@vger.kernel.org List-ID: This patch removes a useless call to brelse(bitmap_bh) since at that point bitmap_bh is NULL. It also converts the last brelse(bitmap_bh) into a __brelse(bitmap_bh) since at that point bitmap_bh is no more NULL. Signed-off-by: Francis Moreau --- fs/ext2/ialloc.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/fs/ext2/ialloc.c b/fs/ext2/ialloc.c index ad7d572..5addd35 100644 --- a/fs/ext2/ialloc.c +++ b/fs/ext2/ialloc.c @@ -135,14 +135,13 @@ void ext2_free_inode (struct inode * inode) ino > le32_to_cpu(es->s_inodes_count)) { ext2_error (sb, "ext2_free_inode", "reserved or nonexistent inode %lu", ino); - goto error_return; + return; } block_group = (ino - 1) / EXT2_INODES_PER_GROUP(sb); bit = (ino - 1) % EXT2_INODES_PER_GROUP(sb); - brelse(bitmap_bh); bitmap_bh = read_inode_bitmap(sb, block_group); if (!bitmap_bh) - goto error_return; + return; /* Ok, now we can actually update the inode bitmaps.. */ if (!ext2_clear_bit_atomic(sb_bgl_lock(EXT2_SB(sb), block_group), @@ -154,8 +153,8 @@ void ext2_free_inode (struct inode * inode) mark_buffer_dirty(bitmap_bh); if (sb->s_flags & MS_SYNCHRONOUS) sync_dirty_buffer(bitmap_bh); -error_return: - brelse(bitmap_bh); + + __brelse(bitmap_bh); } /* -- 1.6.6