Merge commit 'c039c332f23e794deb6d6f37b9f07ff3b27fb2cf' into md

Pull in pre-requisites for adding raid10 support to dm-raid.

1 files changed, 5 insertions, 0 deletions

diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c
index 41a3ccff18d8..8f660dd6137a 100644
--- a/fs/fs-writeback.c
+++ b/fs/fs-writeback.c
@@ -1315,6 +1315,8 @@ void writeback_inodes_sb_nr(struct super_block *sb,
                 .reason                 = reason,
         };
 
+        if (sb->s_bdi == &noop_backing_dev_info)
+                return;
         WARN_ON(!rwsem_is_locked(&sb->s_umount));
         bdi_queue_work(sb->s_bdi, &work);
         wait_for_completion(&done);
@@ -1398,6 +1400,9 @@ void sync_inodes_sb(struct super_block *sb)
                 .reason         = WB_REASON_SYNC,
         };
 
+        /* Nothing to do? */
+        if (sb->s_bdi == &noop_backing_dev_info)
+                return;
         WARN_ON(!rwsem_is_locked(&sb->s_umount));
 
         bdi_queue_work(sb->s_bdi, &work);