Skip to contentSkip to conversation

Remove superfluous lock_super() in ext2 and ext3 xattr code

PATCH In review Andreas Gruenbacher 2 participants 2 messages Oct 19, 2006 ext2 file system

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Remove superfluous lock_super() in ext2 and ext3 xattr code

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

fs/ext2/xattr.c +1 -4
Index: linux-2.6.19-rc2/fs/ext2/xattr.c
===================================================================
@@ -342,12 +342,9 @@ static void ext2_xattr_update_super_bloc
 	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
Index: linux-2.6.19-rc2/fs/ext3/xattr.c
===================================================================
@@ -459,14 +459,11 @@ static void ext3_xattr_update_super_bloc
 	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);
 }
 
 /*
#1 lore raw
Quoted 2 lines · On Thu, 19 Oct 2006 20:34:24 +0200 Andreas Gruenbacher <[email protected]> wrote:

Index: linux-2.6.19-rc2/fs/ext2/xattr.c
Index: linux-2.6.19-rc2/fs/ext3/xattr.c

You forgot ext4 ;)

I updated the patch, thanks.