3 files changed, 14 insertions, 6 deletions

diff --git a/fs/fat/fatent.c b/fs/fat/fatent.c
index 4164cd54c4d1..20a22875f0a1 100644
--- a/fs/fat/fatent.c
+++ b/fs/fat/fatent.c
@@ -476,6 +476,7 @@ int fat_alloc_clusters(struct inode *inode, int *cluster, int nr_cluster)
                                 sbi->prev_free = entry;
                                 if (sbi->free_clusters != -1)
                                         sbi->free_clusters--;
+                                sb->s_dirt = 1;
 
                                 cluster[idx_clus] = entry;
                                 idx_clus++;
@@ -496,6 +497,7 @@ int fat_alloc_clusters(struct inode *inode, int *cluster, int nr_cluster)
 
         /* Couldn't allocate the free entries */
         sbi->free_clusters = 0;
+        sb->s_dirt = 1;
         err = -ENOSPC;
 
 out:
@@ -509,7 +511,6 @@ out:
         }
         for (i = 0; i < nr_bhs; i++)
                 brelse(bhs[i]);
-        fat_clusters_flush(sb);
 
         if (err && idx_clus)
                 fat_free_clusters(inode, cluster[0]);
@@ -542,8 +543,10 @@ int fat_free_clusters(struct inode *inode, int cluster)
                 }
 
                 ops->ent_put(&fatent, FAT_ENT_FREE);
-                if (sbi->free_clusters != -1)
+                if (sbi->free_clusters != -1) {
                         sbi->free_clusters++;
+                        sb->s_dirt = 1;
+                }
 
                 if (nr_bhs + fatent.nr_bhs > MAX_BUF_PER_PAGE) {
                         if (sb->s_flags & MS_SYNCHRONOUS) {
@@ -605,6 +608,7 @@ int fat_count_free_clusters(struct super_block *sb)
                 } while (fat_ent_next(sbi, &fatent));
         }
         sbi->free_clusters = free;
+        sb->s_dirt = 1;
         fatent_brelse(&fatent);
 out:
         unlock_fat(sbi);
diff --git a/fs/fat/inode.c b/fs/fat/inode.c
index a0f9b9fe1307..897312616b0a 100644
--- a/fs/fat/inode.c
+++ b/fs/fat/inode.c
@@ -374,12 +374,17 @@ static void fat_clear_inode(struct inode *inode)
         unlock_kernel();
 }
 
-static void fat_put_super(struct super_block *sb)
+static void fat_write_super(struct super_block *sb)
 {
-        struct msdos_sb_info *sbi = MSDOS_SB(sb);
+        sb->s_dirt = 0;
 
         if (!(sb->s_flags & MS_RDONLY))
                 fat_clusters_flush(sb);
+}
+
+static void fat_put_super(struct super_block *sb)
+{
+        struct msdos_sb_info *sbi = MSDOS_SB(sb);
 
         if (sbi->nls_disk) {
                 unload_nls(sbi->nls_disk);
@@ -546,6 +551,7 @@ static struct super_operations fat_sops = {
         .write_inode    = fat_write_inode,
         .delete_inode   = fat_delete_inode,
         .put_super      = fat_put_super,
+        .write_super    = fat_write_super,
         .statfs         = fat_statfs,
         .clear_inode    = fat_clear_inode,
         .remount_fs     = fat_remount,
diff --git a/fs/fat/misc.c b/fs/fat/misc.c
index 2a0df2122f5d..9b592e37e259 100644
--- a/fs/fat/misc.c
+++ b/fs/fat/misc.c
@@ -67,8 +67,6 @@ void fat_clusters_flush(struct super_block *sb)
                 if (sbi->prev_free != -1)
                         fsinfo->next_cluster = cpu_to_le32(sbi->prev_free);
                 mark_buffer_dirty(bh);
-                if (sb->s_flags & MS_SYNCHRONOUS)
-                        sync_dirty_buffer(bh);
         }
         brelse(bh);
 }