Sanitize ->fsync() for FAT

* mark directory data blocks as assoc. metadata
* add new inode to deal with FAT, mark FAT blocks as assoc. metadata of that
* now ->fsync() is trivial both for files and directories

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

1 files changed, 8 insertions, 8 deletions

diff --git a/fs/fat/dir.c b/fs/fat/dir.c
index 3a7f603b6982..f3500294eec5 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]);
                 }