Merge branch 'akpm' (Andrew's patch-bomb)

Merge misc patches from Andrew Morton:

 - the "misc" tree - stuff from all over the map

 - checkpatch updates

 - fatfs

 - kmod changes

 - procfs

 - cpumask

 - UML

 - kexec

 - mqueue

 - rapidio

 - pidns

 - some checkpoint-restore feature work.  Reluctantly.  Most of it
   delayed a release.  I'm still rather worried that we don't have a
   clear roadmap to completion for this work.

* emailed from Andrew Morton <akpm@linux-foundation.org>: (78 patches)
  kconfig: update compression algorithm info
  c/r: prctl: add ability to set new mm_struct::exe_file
  c/r: prctl: extend PR_SET_MM to set up more mm_struct entries
  c/r: procfs: add arg_start/end, env_start/end and exit_code members to /proc/$pid/stat
  syscalls, x86: add __NR_kcmp syscall
  fs, proc: introduce /proc/<pid>/task/<tid>/children entry
  sysctl: make kernel.ns_last_pid control dependent on CHECKPOINT_RESTORE
  aio/vfs: cleanup of rw_copy_check_uvector() and compat_rw_copy_check_uvector()
  eventfd: change int to __u64 in eventfd_signal()
  fs/nls: add Apple NLS
  pidns: make killed children autoreap
  pidns: use task_active_pid_ns in do_notify_parent
  rapidio/tsi721: add DMA engine support
  rapidio: add DMA engine support for RIO data transfers
  ipc/mqueue: add rbtree node caching support
  tools/selftests: add mq_perf_tests
  ipc/mqueue: strengthen checks on mqueue creation
  ipc/mqueue: correct mq_attr_ok test
  ipc/mqueue: improve performance of send/recv
  selftests: add mq_open_tests
  ...

1 files changed, 24 insertions, 30 deletions

diff --git a/fs/fat/inode.c b/fs/fat/inode.c
index b3d290c1b513..c2973ea5df9a 100644
--- a/fs/fat/inode.c
+++ b/fs/fat/inode.c
@@ -459,37 +459,11 @@ static void fat_evict_inode(struct inode *inode)
         fat_detach(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)
-{
-        int err = 0;
-
-        if (sb->s_dirt) {
-                lock_super(sb);
-                sb->s_dirt = 0;
-                err = fat_clusters_flush(sb);
-                unlock_super(sb);
-        }
-
-        return err;
-}
-
 static void fat_put_super(struct super_block *sb)
 {
         struct msdos_sb_info *sbi = MSDOS_SB(sb);
 
-        if (sb->s_dirt)
-                fat_write_super(sb);
-
+        iput(sbi->fsinfo_inode);
         iput(sbi->fat_inode);
 
         unload_nls(sbi->nls_disk);
@@ -661,7 +635,18 @@ retry:
 
 static int fat_write_inode(struct inode *inode, struct writeback_control *wbc)
 {
-        return __fat_write_inode(inode, wbc->sync_mode == WB_SYNC_ALL);
+        int err;
+
+        if (inode->i_ino == MSDOS_FSINFO_INO) {
+                struct super_block *sb = inode->i_sb;
+
+                lock_super(sb);
+                err = fat_clusters_flush(sb);
+                unlock_super(sb);
+        } else
+                err = __fat_write_inode(inode, wbc->sync_mode == WB_SYNC_ALL);
+
+        return err;
 }
 
 int fat_sync_inode(struct inode *inode)
@@ -678,8 +663,6 @@ static const struct super_operations fat_sops = {
         .write_inode    = fat_write_inode,
         .evict_inode    = fat_evict_inode,
         .put_super      = fat_put_super,
-        .write_super    = fat_write_super,
-        .sync_fs        = fat_sync_fs,
         .statfs         = fat_statfs,
         .remount_fs     = fat_remount,
 
@@ -1244,6 +1227,7 @@ int fat_fill_super(struct super_block *sb, void *data, int silent, int isvfat,
                    void (*setup)(struct super_block *))
 {
         struct inode *root_inode = NULL, *fat_inode = NULL;
+        struct inode *fsinfo_inode = NULL;
         struct buffer_head *bh;
         struct fat_boot_sector *b;
         struct msdos_sb_info *sbi;
@@ -1490,6 +1474,14 @@ int fat_fill_super(struct super_block *sb, void *data, int silent, int isvfat,
                 goto out_fail;
         MSDOS_I(fat_inode)->i_pos = 0;
         sbi->fat_inode = fat_inode;
+
+        fsinfo_inode = new_inode(sb);
+        if (!fsinfo_inode)
+                goto out_fail;
+        fsinfo_inode->i_ino = MSDOS_FSINFO_INO;
+        sbi->fsinfo_inode = fsinfo_inode;
+        insert_inode_hash(fsinfo_inode);
+
         root_inode = new_inode(sb);
         if (!root_inode)
                 goto out_fail;
@@ -1516,6 +1508,8 @@ out_invalid:
                 fat_msg(sb, KERN_INFO, "Can't find a valid FAT filesystem");
 
 out_fail:
+        if (fsinfo_inode)
+                iput(fsinfo_inode);
         if (fat_inode)
                 iput(fat_inode);
         unload_nls(sbi->nls_io);