From: akpm@osdl.org Subject: - remove-superfluous-lock_super-in-ext2-and-ext3-xattr-code.patch removed from -mm tree Date: Thu, 07 Dec 2006 15:02:21 -0800 Message-ID: <200612072302.kB7N2Ln3029844@shell0.pdx.osdl.net> Return-path: Received: from smtp.osdl.org ([65.172.181.25]:51675 "EHLO smtp.osdl.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1163784AbWLGXCZ (ORCPT ); Thu, 7 Dec 2006 18:02:25 -0500 To: agruen@suse.de, linux-ext4@vger.kernel.org, mm-commits@vger.kernel.org Sender: linux-ext4-owner@vger.kernel.org List-Id: linux-ext4.vger.kernel.org The patch titled Remove superfluous lock_super() in extN xattr code has been removed from the -mm tree. Its filename was remove-superfluous-lock_super-in-ext2-and-ext3-xattr-code.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ Subject: Remove superfluous lock_super() in extN xattr code From: Andreas Gruenbacher lock_super() is unnecessary for setting super-block feature flags. Use the provided *_SET_COMPAT_FEATURE() macros as well. Signed-off-by: Andreas Gruenbacher Cc: Signed-off-by: Andrew Morton --- fs/ext2/xattr.c | 5 +---- fs/ext3/xattr.c | 5 +---- fs/ext4/xattr.c | 5 +---- 3 files changed, 3 insertions(+), 12 deletions(-) diff -puN fs/ext2/xattr.c~remove-superfluous-lock_super-in-ext2-and-ext3-xattr-code fs/ext2/xattr.c --- a/fs/ext2/xattr.c~remove-superfluous-lock_super-in-ext2-and-ext3-xattr-code +++ a/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); } /* diff -puN fs/ext3/xattr.c~remove-superfluous-lock_super-in-ext2-and-ext3-xattr-code fs/ext3/xattr.c --- a/fs/ext3/xattr.c~remove-superfluous-lock_super-in-ext2-and-ext3-xattr-code +++ a/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); } /* diff -puN fs/ext4/xattr.c~remove-superfluous-lock_super-in-ext2-and-ext3-xattr-code fs/ext4/xattr.c --- a/fs/ext4/xattr.c~remove-superfluous-lock_super-in-ext2-and-ext3-xattr-code +++ a/fs/ext4/xattr.c @@ -459,14 +459,11 @@ static void ext4_xattr_update_super_bloc 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); } /* _ Patches currently in -mm which might be from agruen@suse.de are origin.patch