Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 524e4a1d authored by Francis Moreau's avatar Francis Moreau Committed by Jan Kara
Browse files

ext2: remove useless call to brelse() in ext2_free_inode() 



This patch removes a useless call to brelse(bitmap_bh) since at that
point bitmap_bh is NULL and slightly cleans up bitmap_bh handling.

Signed-off-by: default avatarFrancis Moreau <francis.moro@gmail.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent eabf290d

fs/ext2/ialloc.c

+4 −5
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ void ext2_free_inode (struct inode * inode) 
	struct super_block * sb = inode->i_sb;

	int is_directory;

	unsigned long ino;

	struct buffer_head *bitmap_bh = NULL;

	struct buffer_head *bitmap_bh;

	unsigned long block_group;

	unsigned long bit;

	struct ext2_super_block * es;
@@ -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,7 +153,7 @@ 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);

}