Merge branch 'irq-threaded-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / fs / sync.c

diff --git a/fs/sync.c b/fs/sync.c
index 3422ba6..103cc7f 100644 (file)
--- a/fs/sync.c
+++ b/fs/sync.c
@@ -19,20 +19,22 @@
                        SYNC_FILE_RANGE_WAIT_AFTER)
 
 /*
- * Do the filesystem syncing work. For simple filesystems sync_inodes_sb(sb, 0)
- * just dirties buffers with inodes so we have to submit IO for these buffers
- * via __sync_blockdev(). This also speeds up the wait == 1 case since in that
- * case write_inode() functions do sync_dirty_buffer() and thus effectively
- * write one block at a time.
+ * Do the filesystem syncing work. For simple filesystems
+ * writeback_inodes_sb(sb) just dirties buffers with inodes so we have to
+ * submit IO for these buffers via __sync_blockdev(). This also speeds up the
+ * wait == 1 case since in that case write_inode() functions do
+ * sync_dirty_buffer() and thus effectively write one block at a time.
  */
 static int __sync_filesystem(struct super_block *sb, int wait)
 {
        /* Avoid doing twice syncing and cache pruning for quota sync */
-       if (!wait)
+       if (!wait) {
                writeout_quota_sb(sb, -1);
-       else
+               writeback_inodes_sb(sb);
+       } else {
                sync_quota_sb(sb, -1);
-       sync_inodes_sb(sb, wait);
+               sync_inodes_sb(sb);
+       }
        if (sb->s_op->sync_fs)
                sb->s_op->sync_fs(sb, wait);
        return __sync_blockdev(sb->s_bdev, wait);
@@ -118,7 +120,7 @@ restart:
  */
 SYSCALL_DEFINE0(sync)
 {
-       wakeup_pdflush(0);
+       wakeup_flusher_threads(0);
        sync_filesystems(0);
        sync_filesystems(1);
        if (unlikely(laptop_mode))