7 files changed, 69 insertions, 19 deletions

diff --git a/fs/fat/dir.c b/fs/fat/dir.c
index 7e7924c2ea30..3b8e71b412fd 100644
--- a/fs/fat/dir.c
+++ b/fs/fat/dir.c
@@ -840,7 +840,7 @@ const struct file_operations fat_dir_operations = {
 #ifdef CONFIG_COMPAT
         .compat_ioctl   = fat_compat_dir_ioctl,
 #endif
-        .fsync          = file_fsync,
+        .fsync          = fat_file_fsync,
 };
 
 static int fat_get_short_entry(struct inode *dir, loff_t *pos,
@@ -967,7 +967,7 @@ static int __fat_remove_entries(struct inode *dir, loff_t pos, int nr_slots)
                         de++;
                         nr_slots--;
                 }
-                mark_buffer_dirty(bh);
+                mark_buffer_dirty_inode(bh, dir);
                 if (IS_DIRSYNC(dir))
                         err = sync_dirty_buffer(bh);
                 brelse(bh);
@@ -1001,7 +1001,7 @@ int fat_remove_entries(struct inode *dir, struct fat_slot_info *sinfo)
                 de--;
                 nr_slots--;
         }
-        mark_buffer_dirty(bh);
+        mark_buffer_dirty_inode(bh, dir);
         if (IS_DIRSYNC(dir))
                 err = sync_dirty_buffer(bh);
         brelse(bh);
@@ -1051,7 +1051,7 @@ static int fat_zeroed_cluster(struct inode *dir, sector_t blknr, int nr_used,
                 }
                 memset(bhs[n]->b_data, 0, sb->s_blocksize);
                 set_buffer_uptodate(bhs[n]);
-                mark_buffer_dirty(bhs[n]);
+                mark_buffer_dirty_inode(bhs[n], dir);
 
                 n++;
                 blknr++;
@@ -1131,7 +1131,7 @@ int fat_alloc_new_dir(struct inode *dir, struct timespec *ts)
         de[0].size = de[1].size = 0;
         memset(de + 2, 0, sb->s_blocksize - 2 * sizeof(*de));
         set_buffer_uptodate(bhs[0]);
-        mark_buffer_dirty(bhs[0]);
+        mark_buffer_dirty_inode(bhs[0], dir);
 
         err = fat_zeroed_cluster(dir, blknr, 1, bhs, MAX_BUF_PER_PAGE);
         if (err)
@@ -1193,7 +1193,7 @@ static int fat_add_new_entries(struct inode *dir, void *slots, int nr_slots,
                         slots += copy;
                         size -= copy;
                         set_buffer_uptodate(bhs[n]);
-                        mark_buffer_dirty(bhs[n]);
+                        mark_buffer_dirty_inode(bhs[n], dir);
                         if (!size)
                                 break;
                         n++;
@@ -1293,7 +1293,7 @@ found:
                 for (i = 0; i < long_bhs; i++) {
                         int copy = min_t(int, sb->s_blocksize - offset, size);
                         memcpy(bhs[i]->b_data + offset, slots, copy);
-                        mark_buffer_dirty(bhs[i]);
+                        mark_buffer_dirty_inode(bhs[i], dir);
                         offset = 0;
                         slots += copy;
                         size -= copy;
@@ -1304,7 +1304,7 @@ found:
                         /* Fill the short name slot. */
                         int copy = min_t(int, sb->s_blocksize - offset, size);
                         memcpy(bhs[i]->b_data + offset, slots, copy);
-                        mark_buffer_dirty(bhs[i]);
+                        mark_buffer_dirty_inode(bhs[i], dir);
                         if (IS_DIRSYNC(dir))
                                 err = sync_dirty_buffer(bhs[i]);
                 }
diff --git a/fs/fat/fat.h b/fs/fat/fat.h
index ed10896d5da5..adb0e72a176d 100644
--- a/fs/fat/fat.h
+++ b/fs/fat/fat.h
@@ -79,6 +79,7 @@ struct msdos_sb_info {
 
         int fatent_shift;
         struct fatent_operations *fatent_ops;
+        struct inode *fat_inode;
 
         spinlock_t inode_hash_lock;
         struct hlist_head inode_hashtable[FAT_HASH_SIZE];
@@ -256,6 +257,7 @@ struct fat_entry {
         } u;
         int nr_bhs;
         struct buffer_head *bhs[2];
+        struct inode *fat_inode;
 };
 
 static inline void fatent_init(struct fat_entry *fatent)
@@ -264,6 +266,7 @@ static inline void fatent_init(struct fat_entry *fatent)
         fatent->entry = 0;
         fatent->u.ent32_p = NULL;
         fatent->bhs[0] = fatent->bhs[1] = NULL;
+        fatent->fat_inode = NULL;
 }
 
 static inline void fatent_set_entry(struct fat_entry *fatent, int entry)
@@ -280,6 +283,7 @@ static inline void fatent_brelse(struct fat_entry *fatent)
                 brelse(fatent->bhs[i]);
         fatent->nr_bhs = 0;
         fatent->bhs[0] = fatent->bhs[1] = NULL;
+        fatent->fat_inode = NULL;
 }
 
 extern void fat_ent_access_init(struct super_block *sb);
@@ -301,6 +305,8 @@ extern int fat_setattr(struct dentry * dentry, struct iattr * attr);
 extern void fat_truncate(struct inode *inode);
 extern int fat_getattr(struct vfsmount *mnt, struct dentry *dentry,
                        struct kstat *stat);
+extern int fat_file_fsync(struct file *file, struct dentry *dentry,
+                          int datasync);
 
 /* fat/inode.c */
 extern void fat_attach(struct inode *inode, loff_t i_pos);
diff --git a/fs/fat/fatent.c b/fs/fat/fatent.c
index 60c31f7e678c..a81037721a6f 100644
--- a/fs/fat/fatent.c
+++ b/fs/fat/fatent.c
@@ -73,6 +73,8 @@ static int fat12_ent_bread(struct super_block *sb, struct fat_entry *fatent,
         struct buffer_head **bhs = fatent->bhs;
 
         WARN_ON(blocknr < MSDOS_SB(sb)->fat_start);
+        fatent->fat_inode = MSDOS_SB(sb)->fat_inode;
+
         bhs[0] = sb_bread(sb, blocknr);
         if (!bhs[0])
                 goto err;
@@ -103,6 +105,7 @@ static int fat_ent_bread(struct super_block *sb, struct fat_entry *fatent,
         struct fatent_operations *ops = MSDOS_SB(sb)->fatent_ops;
 
         WARN_ON(blocknr < MSDOS_SB(sb)->fat_start);
+        fatent->fat_inode = MSDOS_SB(sb)->fat_inode;
         fatent->bhs[0] = sb_bread(sb, blocknr);
         if (!fatent->bhs[0]) {
                 printk(KERN_ERR "FAT: FAT read failed (blocknr %llu)\n",
@@ -167,9 +170,9 @@ static void fat12_ent_put(struct fat_entry *fatent, int new)
         }
         spin_unlock(&fat12_entry_lock);
 
-        mark_buffer_dirty(fatent->bhs[0]);
+        mark_buffer_dirty_inode(fatent->bhs[0], fatent->fat_inode);
         if (fatent->nr_bhs == 2)
-                mark_buffer_dirty(fatent->bhs[1]);
+                mark_buffer_dirty_inode(fatent->bhs[1], fatent->fat_inode);
 }
 
 static void fat16_ent_put(struct fat_entry *fatent, int new)
@@ -178,7 +181,7 @@ static void fat16_ent_put(struct fat_entry *fatent, int new)
                 new = EOF_FAT16;
 
         *fatent->u.ent16_p = cpu_to_le16(new);
-        mark_buffer_dirty(fatent->bhs[0]);
+        mark_buffer_dirty_inode(fatent->bhs[0], fatent->fat_inode);
 }
 
 static void fat32_ent_put(struct fat_entry *fatent, int new)
@@ -189,7 +192,7 @@ static void fat32_ent_put(struct fat_entry *fatent, int new)
         WARN_ON(new & 0xf0000000);
         new |= le32_to_cpu(*fatent->u.ent32_p) & ~0x0fffffff;
         *fatent->u.ent32_p = cpu_to_le32(new);
-        mark_buffer_dirty(fatent->bhs[0]);
+        mark_buffer_dirty_inode(fatent->bhs[0], fatent->fat_inode);
 }
 
 static int fat12_ent_next(struct fat_entry *fatent)
@@ -381,7 +384,7 @@ static int fat_mirror_bhs(struct super_block *sb, struct buffer_head **bhs,
                         }
                         memcpy(c_bh->b_data, bhs[n]->b_data, sb->s_blocksize);
                         set_buffer_uptodate(c_bh);
-                        mark_buffer_dirty(c_bh);
+                        mark_buffer_dirty_inode(c_bh, sbi->fat_inode);
                         if (sb->s_flags & MS_SYNCHRONOUS)
                                 err = sync_dirty_buffer(c_bh);
                         brelse(c_bh);
diff --git a/fs/fat/file.c b/fs/fat/file.c
index 9b94094c7010..b28ea646ff60 100644
--- a/fs/fat/file.c
+++ b/fs/fat/file.c
@@ -139,6 +139,18 @@ static int fat_file_release(struct inode *inode, struct file *filp)
         return 0;
 }
 
+int fat_file_fsync(struct file *filp, struct dentry *dentry, int datasync)
+{
+        struct inode *inode = dentry->d_inode;
+        int res, err;
+
+        res = simple_fsync(filp, dentry, datasync);
+        err = sync_mapping_buffers(MSDOS_SB(inode->i_sb)->fat_inode->i_mapping);
+
+        return res ? res : err;
+}
+
+
 const struct file_operations fat_file_operations = {
         .llseek         = generic_file_llseek,
         .read           = do_sync_read,
@@ -148,7 +160,7 @@ const struct file_operations fat_file_operations = {
         .mmap           = generic_file_mmap,
         .release        = fat_file_release,
         .ioctl          = fat_generic_ioctl,
-        .fsync          = file_fsync,
+        .fsync          = fat_file_fsync,
         .splice_read    = generic_file_splice_read,
 };
 
diff --git a/fs/fat/inode.c b/fs/fat/inode.c
index 2b9052265e3e..304b411cb8bc 100644
--- a/fs/fat/inode.c
+++ b/fs/fat/inode.c
@@ -441,16 +441,35 @@ static void fat_clear_inode(struct inode *inode)
 
 static void fat_write_super(struct super_block *sb)
 {
+        lock_super(sb);
         sb->s_dirt = 0;
 
         if (!(sb->s_flags & MS_RDONLY))
                 fat_clusters_flush(sb);
+        unlock_super(sb);
+}
+
+static int fat_sync_fs(struct super_block *sb, int wait)
+{
+        lock_super(sb);
+        fat_clusters_flush(sb);
+        sb->s_dirt = 0;
+        unlock_super(sb);
+
+        return 0;
 }
 
 static void fat_put_super(struct super_block *sb)
 {
         struct msdos_sb_info *sbi = MSDOS_SB(sb);
 
+        lock_kernel();
+
+        if (sb->s_dirt)
+                fat_write_super(sb);
+
+        iput(sbi->fat_inode);
+
         if (sbi->nls_disk) {
                 unload_nls(sbi->nls_disk);
                 sbi->nls_disk = NULL;
@@ -467,6 +486,8 @@ static void fat_put_super(struct super_block *sb)
 
         sb->s_fs_info = NULL;
         kfree(sbi);
+
+        unlock_kernel();
 }
 
 static struct kmem_cache *fat_inode_cachep;
@@ -632,6 +653,7 @@ static const struct super_operations fat_sops = {
         .delete_inode   = fat_delete_inode,
         .put_super      = fat_put_super,
         .write_super    = fat_write_super,
+        .sync_fs        = fat_sync_fs,
         .statfs         = fat_statfs,
         .clear_inode    = fat_clear_inode,
         .remount_fs     = fat_remount,
@@ -1194,7 +1216,7 @@ static int fat_read_root(struct inode *inode)
 int fat_fill_super(struct super_block *sb, void *data, int silent,
                    const struct inode_operations *fs_dir_inode_ops, int isvfat)
 {
-        struct inode *root_inode = NULL;
+        struct inode *root_inode = NULL, *fat_inode = NULL;
         struct buffer_head *bh;
         struct fat_boot_sector *b;
         struct msdos_sb_info *sbi;
@@ -1434,6 +1456,11 @@ int fat_fill_super(struct super_block *sb, void *data, int silent,
         }
 
         error = -ENOMEM;
+        fat_inode = new_inode(sb);
+        if (!fat_inode)
+                goto out_fail;
+        MSDOS_I(fat_inode)->i_pos = 0;
+        sbi->fat_inode = fat_inode;
         root_inode = new_inode(sb);
         if (!root_inode)
                 goto out_fail;
@@ -1459,6 +1486,8 @@ out_invalid:
                        " on dev %s.\n", sb->s_id);
 
 out_fail:
+        if (fat_inode)
+                iput(fat_inode);
         if (root_inode)
                 iput(root_inode);
         if (sbi->nls_io)
diff --git a/fs/fat/namei_msdos.c b/fs/fat/namei_msdos.c
index 72f5c6402ef3..82f88733b681 100644
--- a/fs/fat/namei_msdos.c
+++ b/fs/fat/namei_msdos.c
@@ -544,7 +544,7 @@ static int do_msdos_rename(struct inode *old_dir, unsigned char *old_name,
                 int start = MSDOS_I(new_dir)->i_logstart;
                 dotdot_de->start = cpu_to_le16(start);
                 dotdot_de->starthi = cpu_to_le16(start >> 16);
-                mark_buffer_dirty(dotdot_bh);
+                mark_buffer_dirty_inode(dotdot_bh, old_inode);
                 if (IS_DIRSYNC(new_dir)) {
                         err = sync_dirty_buffer(dotdot_bh);
                         if (err)
@@ -586,7 +586,7 @@ error_dotdot:
                 int start = MSDOS_I(old_dir)->i_logstart;
                 dotdot_de->start = cpu_to_le16(start);
                 dotdot_de->starthi = cpu_to_le16(start >> 16);
-                mark_buffer_dirty(dotdot_bh);
+                mark_buffer_dirty_inode(dotdot_bh, old_inode);
                 corrupt |= sync_dirty_buffer(dotdot_bh);
         }
 error_inode:
diff --git a/fs/fat/namei_vfat.c b/fs/fat/namei_vfat.c
index cb6ddb8c0bc2..8d6fdcfd41df 100644
--- a/fs/fat/namei_vfat.c
+++ b/fs/fat/namei_vfat.c
@@ -965,7 +965,7 @@ static int vfat_rename(struct inode *old_dir, struct dentry *old_dentry,
                 int start = MSDOS_I(new_dir)->i_logstart;
                 dotdot_de->start = cpu_to_le16(start);
                 dotdot_de->starthi = cpu_to_le16(start >> 16);
-                mark_buffer_dirty(dotdot_bh);
+                mark_buffer_dirty_inode(dotdot_bh, old_inode);
                 if (IS_DIRSYNC(new_dir)) {
                         err = sync_dirty_buffer(dotdot_bh);
                         if (err)
@@ -1009,7 +1009,7 @@ error_dotdot:
                 int start = MSDOS_I(old_dir)->i_logstart;
                 dotdot_de->start = cpu_to_le16(start);
                 dotdot_de->starthi = cpu_to_le16(start >> 16);
-                mark_buffer_dirty(dotdot_bh);
+                mark_buffer_dirty_inode(dotdot_bh, old_inode);
                 corrupt |= sync_dirty_buffer(dotdot_bh);
         }
 error_inode: