Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:
	Documentation/feature-removal-schedule.txt
	drivers/scsi/fcoe/fcoe.c
	net/core/drop_monitor.c
	net/core/net-traces.c

1 files changed, 1 insertions, 2 deletions

diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
index 225202db8974..27967f92e820 100644
--- a/fs/ext3/balloc.c
+++ b/fs/ext3/balloc.c
@@ -649,7 +649,7 @@ do_more:
                 count = overflow;
                 goto do_more;
         }
-        sb->s_dirt = 1;
+
 error_return:
         brelse(bitmap_bh);
         ext3_std_error(sb, err);
@@ -1708,7 +1708,6 @@ allocated:
         if (!fatal)
                 fatal = err;
 
-        sb->s_dirt = 1;
         if (fatal)
                 goto out;