Commit 3e44f9f1 authored Feb 24, 2010 by Jan Blunck Committed by Arnd Bergmann Oct 04, 2010

BKL: Remove BKL from ext2 filesystem

The BKL is still used in ext2_put_super(), ext2_fill_super(), ext2_sync_fs()
ext2_remount() and ext2_write_inode(). From these calls ext2_put_super(),
ext2_fill_super() and ext2_remount() are protected against each other by
the struct super_block s_umount rw semaphore. The call in ext2_write_inode()
could only protect the modification of the ext2_sb_info through
ext2_update_dynamic_rev() against concurrent ext2_sync_fs() or ext2_remount().
ext2_fill_super() and ext2_put_super() can be left out because you need a
valid filesystem reference in all three cases, which you do not have when
you are one of these functions.

If the BKL is only protecting the modification of the ext2_sb_info it can
safely be removed since this is protected by the struct ext2_sb_info s_lock.

Signed-off-by: Jan Blunck <jblunck@infradead.org>
Cc: Jan Kara <jack@suse.cz>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parent 6841c050

fs/ext2/super.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -747,8 +747,6 @@ static int ext2_fill_super(struct super_block sb, void data, int silent)
		__le32 features;
		int err;

		lock_kernel();

		err = -ENOMEM;
		sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);
		if (!sbi)
		@@ -1086,7 +1084,6 @@ static int ext2_fill_super(struct super_block sb, void data, int silent)
		if (ext2_setup_super (sb, es, sb->s_flags & MS_RDONLY))
		sb->s_flags \|= MS_RDONLY;
		ext2_write_super(sb);
		unlock_kernel();
		return 0;

		cantfind_ext2:
		@@ -1112,7 +1109,6 @@ failed_sbi:
		kfree(sbi->s_blockgroup_lock);
		kfree(sbi);
		failed_unlock:
		unlock_kernel();
		return ret;
		}

Admin message