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, 14 insertions, 10 deletions

diff --git a/fs/nilfs2/file.c b/fs/nilfs2/file.c
index 26601529dc17..62cebc8e1a1f 100644
--- a/fs/nilfs2/file.c
+++ b/fs/nilfs2/file.c
@@ -37,6 +37,7 @@ int nilfs_sync_file(struct file *file, loff_t start, loff_t end, int datasync)
          * This function should be implemented when the writeback function
          * will be implemented.
          */
+        struct the_nilfs *nilfs;
         struct inode *inode = file->f_mapping->host;
         int err;
 
@@ -45,18 +46,21 @@ int nilfs_sync_file(struct file *file, loff_t start, loff_t end, int datasync)
                 return err;
         mutex_lock(&inode->i_mutex);
 
-        if (!nilfs_inode_dirty(inode)) {
-                mutex_unlock(&inode->i_mutex);
-                return 0;
+        if (nilfs_inode_dirty(inode)) {
+                if (datasync)
+                        err = nilfs_construct_dsync_segment(inode->i_sb, inode,
+                                                            0, LLONG_MAX);
+                else
+                        err = nilfs_construct_segment(inode->i_sb);
         }
-
-        if (datasync)
-                err = nilfs_construct_dsync_segment(inode->i_sb, inode, 0,
-                                                    LLONG_MAX);
-        else
-                err = nilfs_construct_segment(inode->i_sb);
-
         mutex_unlock(&inode->i_mutex);
+
+        nilfs = inode->i_sb->s_fs_info;
+        if (!err && nilfs_test_opt(nilfs, BARRIER)) {
+                err = blkdev_issue_flush(inode->i_sb->s_bdev, GFP_KERNEL, NULL);
+                if (err != -EIO)
+                        err = 0;
+        }
         return err;
 }