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

Commit d646cf82 authored by Jan Blunck's avatar Jan Blunck Committed by Arnd Bergmann
Browse files

BKL: Remove BKL from ext3 fill_super() 



The BKL is protecting nothing than two memory allocations here.

Signed-off-by: default avatarJan Blunck <jblunck@infradead.org>
Acked-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent b0991aa3

fs/ext3/super.c

+1 −12
Original line number Diff line number Diff line
@@ -1611,19 +1611,14 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent) 
	__le32 features;

	int err;



	lock_kernel();



	sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);

	if (!sbi) {

		unlock_kernel();

	if (!sbi)

		return -ENOMEM;

	}



	sbi->s_blockgroup_lock =

		kzalloc(sizeof(struct blockgroup_lock), GFP_KERNEL);

	if (!sbi->s_blockgroup_lock) {

		kfree(sbi);

		unlock_kernel();

		return -ENOMEM;

	}

	sb->s_fs_info = sbi;
@@ -1632,8 +1627,6 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent) 
	sbi->s_resgid = EXT3_DEF_RESGID;

	sbi->s_sb_block = sb_block;



	unlock_kernel();



	blocksize = sb_min_blocksize(sb, EXT3_MIN_BLOCK_SIZE);

	if (!blocksize) {

		ext3_msg(sb, KERN_ERR, "error: unable to set blocksize");
@@ -2030,8 +2023,6 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent) 
		test_opt(sb,DATA_FLAGS) == EXT3_MOUNT_ORDERED_DATA ? "ordered":

		"writeback");



	lock_kernel();

	unlock_kernel();

	return 0;



cantfind_ext3:
@@ -2061,8 +2052,6 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent) 
	sb->s_fs_info = NULL;

	kfree(sbi->s_blockgroup_lock);

	kfree(sbi);

	lock_kernel();

	unlock_kernel();

	return ret;

}