From aaee84f8da28abd3509e51d7b7ad0433f5c1ddfa Mon Sep 17 00:00:00 2001
From: Jan Kara <jack@suse.cz>
Date: Sat, 31 Mar 2012 14:22:10 +0200
Subject: [PATCH] --- yaml --- r: 307919 b: refs/heads/master c:
 b838ec2232b764a4903707e212c62f681b32cd51 h: refs/heads/master i:   307917:
 cc0abef5bffc95b198175e00ad43d17bed02108b   307915:
 e34c2181ef1a60f8fbcc1752d559af9eeabce0ea   307911:
 d262014e260ed4f6ec4e5465f63e0b800c0a938b   307903:
 f566fa002d3f5f793371b2610feca928740b5094 v: v3

---
 [refs]                 | 2 +-
 trunk/fs/ext2/balloc.c | 2 --
 trunk/fs/ext2/ialloc.c | 2 --
 trunk/fs/ext2/super.c  | 3 ---
 trunk/fs/ext2/xattr.c  | 1 -
 5 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 6404b9649928..6ef798e2bb4b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2b2242081314ee4385f3b49d92b0adff8324d80
+refs/heads/master: b838ec2232b764a4903707e212c62f681b32cd51
diff --git a/trunk/fs/ext2/balloc.c b/trunk/fs/ext2/balloc.c
index a8cbe1bc6ad4..a9bba1e39200 100644
--- a/trunk/fs/ext2/balloc.c
+++ b/trunk/fs/ext2/balloc.c
@@ -165,7 +165,6 @@ static void release_blocks(struct super_block *sb, int count)
 		struct ext2_sb_info *sbi = EXT2_SB(sb);
 
 		percpu_counter_add(&sbi->s_freeblocks_counter, count);
-		sb->s_dirt = 1;
 	}
 }
 
@@ -180,7 +179,6 @@ static void group_adjust_blocks(struct super_block *sb, int group_no,
 		free_blocks = le16_to_cpu(desc->bg_free_blocks_count);
 		desc->bg_free_blocks_count = cpu_to_le16(free_blocks + count);
 		spin_unlock(sb_bgl_lock(sbi, group_no));
-		sb->s_dirt = 1;
 		mark_buffer_dirty(bh);
 	}
 }
diff --git a/trunk/fs/ext2/ialloc.c b/trunk/fs/ext2/ialloc.c
index 8b15cf8cef37..c13eb7b91a11 100644
--- a/trunk/fs/ext2/ialloc.c
+++ b/trunk/fs/ext2/ialloc.c
@@ -81,7 +81,6 @@ static void ext2_release_inode(struct super_block *sb, int group, int dir)
 	spin_unlock(sb_bgl_lock(EXT2_SB(sb), group));
 	if (dir)
 		percpu_counter_dec(&EXT2_SB(sb)->s_dirs_counter);
-	sb->s_dirt = 1;
 	mark_buffer_dirty(bh);
 }
 
@@ -543,7 +542,6 @@ struct inode *ext2_new_inode(struct inode *dir, umode_t mode,
 	}
 	spin_unlock(sb_bgl_lock(sbi, group));
 
-	sb->s_dirt = 1;
 	mark_buffer_dirty(bh2);
 	if (test_opt(sb, GRPID)) {
 		inode->i_mode = mode;
diff --git a/trunk/fs/ext2/super.c b/trunk/fs/ext2/super.c
index 12a7916cfa9d..a43f9adcc811 100644
--- a/trunk/fs/ext2/super.c
+++ b/trunk/fs/ext2/super.c
@@ -1158,7 +1158,6 @@ static void ext2_sync_super(struct super_block *sb, struct ext2_super_block *es,
 	mark_buffer_dirty(EXT2_SB(sb)->s_sbh);
 	if (wait)
 		sync_dirty_buffer(EXT2_SB(sb)->s_sbh);
-	sb->s_dirt = 0;
 }
 
 /*
@@ -1191,8 +1190,6 @@ void ext2_write_super(struct super_block *sb)
 {
 	if (!(sb->s_flags & MS_RDONLY))
 		ext2_sync_fs(sb, 1);
-	else
-		sb->s_dirt = 0;
 }
 
 static int ext2_remount (struct super_block * sb, int * flags, char * data)
diff --git a/trunk/fs/ext2/xattr.c b/trunk/fs/ext2/xattr.c
index 6dcafc7efdfd..b6754dbbce3c 100644
--- a/trunk/fs/ext2/xattr.c
+++ b/trunk/fs/ext2/xattr.c
@@ -339,7 +339,6 @@ static void ext2_xattr_update_super_block(struct super_block *sb)
 	spin_lock(&EXT2_SB(sb)->s_lock);
 	EXT2_SET_COMPAT_FEATURE(sb, EXT2_FEATURE_COMPAT_EXT_ATTR);
 	spin_unlock(&EXT2_SB(sb)->s_lock);
-	sb->s_dirt = 1;
 	mark_buffer_dirty(EXT2_SB(sb)->s_sbh);
 }