Merge commit 'v2.6.29-rc7' into perfcounters/core

Conflicts:
	arch/x86/mm/iomap_32.c

1 files changed, 0 insertions, 1 deletions

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index a5732c58f676..39d1993cfa13 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -3091,7 +3091,6 @@ static int ext4_freeze(struct super_block *sb)
 
                 /* Journal blocked and flushed, clear needs_recovery flag. */
                 EXT4_CLEAR_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_RECOVER);
-                ext4_commit_super(sb, EXT4_SB(sb)->s_es, 1);
                 error = ext4_commit_super(sb, EXT4_SB(sb)->s_es, 1);
                 if (error)
                         goto out;