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

Commit ed2908f3 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Linus Torvalds
Browse files

[PATCH] Remove superfluous lock_super() in extN xattr code 



lock_super() is unnecessary for setting super-block feature flags.  Use the
provided *_SET_COMPAT_FEATURE() macros as well.

Signed-off-by: default avatarAndreas Gruenbacher <agruen@suse.de>
Cc: <linux-ext4@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 69604067

fs/ext2/xattr.c

+1 −4
Original line number Diff line number Diff line
@@ -342,12 +342,9 @@ static void ext2_xattr_update_super_block(struct super_block *sb) 
	if (EXT2_HAS_COMPAT_FEATURE(sb, EXT2_FEATURE_COMPAT_EXT_ATTR))

		return;



	lock_super(sb);

	EXT2_SB(sb)->s_es->s_feature_compat |=

		cpu_to_le32(EXT2_FEATURE_COMPAT_EXT_ATTR);

	EXT2_SET_COMPAT_FEATURE(sb, EXT2_FEATURE_COMPAT_EXT_ATTR);

	sb->s_dirt = 1;

	mark_buffer_dirty(EXT2_SB(sb)->s_sbh);

	unlock_super(sb);

}



/*

fs/ext3/xattr.c

+1 −4
Original line number Diff line number Diff line
@@ -459,14 +459,11 @@ static void ext3_xattr_update_super_block(handle_t *handle, 
	if (EXT3_HAS_COMPAT_FEATURE(sb, EXT3_FEATURE_COMPAT_EXT_ATTR))

		return;



	lock_super(sb);

	if (ext3_journal_get_write_access(handle, EXT3_SB(sb)->s_sbh) == 0) {

		EXT3_SB(sb)->s_es->s_feature_compat |=

			cpu_to_le32(EXT3_FEATURE_COMPAT_EXT_ATTR);

		EXT3_SET_COMPAT_FEATURE(sb, EXT3_FEATURE_COMPAT_EXT_ATTR);

		sb->s_dirt = 1;

		ext3_journal_dirty_metadata(handle, EXT3_SB(sb)->s_sbh);

	}

	unlock_super(sb);

}



/*

fs/ext4/xattr.c

+1 −4
Original line number Diff line number Diff line
@@ -459,14 +459,11 @@ static void ext4_xattr_update_super_block(handle_t *handle, 
	if (EXT4_HAS_COMPAT_FEATURE(sb, EXT4_FEATURE_COMPAT_EXT_ATTR))

		return;



	lock_super(sb);

	if (ext4_journal_get_write_access(handle, EXT4_SB(sb)->s_sbh) == 0) {

		EXT4_SB(sb)->s_es->s_feature_compat |=

			cpu_to_le32(EXT4_FEATURE_COMPAT_EXT_ATTR);

		EXT4_SET_COMPAT_FEATURE(sb, EXT4_FEATURE_COMPAT_EXT_ATTR);

		sb->s_dirt = 1;

		ext4_journal_dirty_metadata(handle, EXT4_SB(sb)->s_sbh);

	}

	unlock_super(sb);

}



/*