Merge branch 'drm-armada-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox into drm-next

Just one-liner which corrects a select statement for DRM_KMS_FB_HELPER
which looks like it was missed in the initial merge.  Based on 3.13.

* 'drm-armada-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox: (55 commits)
  DRM: armada: fix missing DRM_KMS_FB_HELPER select

1 files changed, 9 insertions, 6 deletions

diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c
index 1f4a10ece2f1..e0259a163f98 100644
--- a/fs/fs-writeback.c
+++ b/fs/fs-writeback.c
@@ -516,13 +516,16 @@ writeback_single_inode(struct inode *inode, struct bdi_writeback *wb,
         }
         WARN_ON(inode->i_state & I_SYNC);
         /*
-         * Skip inode if it is clean. We don't want to mess with writeback
-         * lists in this function since flusher thread may be doing for example
-         * sync in parallel and if we move the inode, it could get skipped. So
-         * here we make sure inode is on some writeback list and leave it there
-         * unless we have completely cleaned the inode.
+         * Skip inode if it is clean and we have no outstanding writeback in
+         * WB_SYNC_ALL mode. We don't want to mess with writeback lists in this
+         * function since flusher thread may be doing for example sync in
+         * parallel and if we move the inode, it could get skipped. So here we
+         * make sure inode is on some writeback list and leave it there unless
+         * we have completely cleaned the inode.
          */
-        if (!(inode->i_state & I_DIRTY))
+        if (!(inode->i_state & I_DIRTY) &&
+            (wbc->sync_mode != WB_SYNC_ALL ||
+             !mapping_tagged(inode->i_mapping, PAGECACHE_TAG_WRITEBACK)))
                 goto out;
         inode->i_state |= I_SYNC;
         spin_unlock(&inode->i_lock);