3 files changed, 12 insertions, 26 deletions

diff --git a/fs/block_dev.c b/fs/block_dev.c
index 6d7274619bf9..cc8d68ac29aa 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -50,32 +50,22 @@ inline struct block_device *I_BDEV(struct inode *inode)
 EXPORT_SYMBOL(I_BDEV);
 
 /*
- * Move the inode from its current bdi to a new bdi. If the inode is dirty we
- * need to move it onto the dirty list of @dst so that the inode is always on
- * the right list.
+ * Move the inode from its current bdi to a new bdi.  Make sure the inode
+ * is clean before moving so that it doesn't linger on the old bdi.
  */
 static void bdev_inode_switch_bdi(struct inode *inode,
                         struct backing_dev_info *dst)
 {
-        struct backing_dev_info *old = inode->i_data.backing_dev_info;
-        bool wakeup_bdi = false;
-
-        if (unlikely(dst == old))               /* deadlock avoidance */
-                return;
-        bdi_lock_two(&old->wb, &dst->wb);
-        spin_lock(&inode->i_lock);
-        inode->i_data.backing_dev_info = dst;
-        if (inode->i_state & I_DIRTY) {
-                if (bdi_cap_writeback_dirty(dst) && !wb_has_dirty_io(&dst->wb))
-                        wakeup_bdi = true;
-                list_move(&inode->i_wb_list, &dst->wb.b_dirty);
+        while (true) {
+                spin_lock(&inode->i_lock);
+                if (!(inode->i_state & I_DIRTY)) {
+                        inode->i_data.backing_dev_info = dst;
+                        spin_unlock(&inode->i_lock);
+                        return;
+                }
+                spin_unlock(&inode->i_lock);
+                WARN_ON_ONCE(write_inode_now(inode, true));
         }
-        spin_unlock(&inode->i_lock);
-        spin_unlock(&old->wb.list_lock);
-        spin_unlock(&dst->wb.list_lock);
-
-        if (wakeup_bdi)
-                bdi_wakeup_thread_delayed(dst);
 }
 
 /* Kill _all_ buffers and pagecache , dirty or not.. */
@@ -1173,8 +1163,6 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
                         if (!ret) {
                                 bd_set_size(bdev,(loff_t)get_capacity(disk)<<9);
                                 bdi = blk_get_backing_dev_info(bdev);
-                                if (bdi == NULL)
-                                        bdi = &default_backing_dev_info;
                                 bdev_inode_switch_bdi(bdev->bd_inode, bdi);
                         }
 
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index a1d36e62179c..7e221b090308 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -1699,7 +1699,7 @@ static int btrfs_congested_fn(void *congested_data, int bdi_bits)
                 if (!device->bdev)
                         continue;
                 bdi = blk_get_backing_dev_info(device->bdev);
-                if (bdi && bdi_congested(bdi, bdi_bits)) {
+                if (bdi_congested(bdi, bdi_bits)) {
                         ret = 1;
                         break;
                 }
diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
index cd7b8ca9b064..497fcde381d7 100644
--- a/fs/xfs/xfs_buf.c
+++ b/fs/xfs/xfs_buf.c
@@ -1678,8 +1678,6 @@ xfs_alloc_buftarg(
         btp->bt_dev =  bdev->bd_dev;
         btp->bt_bdev = bdev;
         btp->bt_bdi = blk_get_backing_dev_info(bdev);
-        if (!btp->bt_bdi)
-                goto error;
 
         if (xfs_setsize_buftarg_early(btp, bdev))
                 goto error;