X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=fs%2Fblock_dev.c;h=44d4a1e9244e74e923d7b26018d4b420aa2e1323;hb=66b8812e87f3fcf9d52b107a8d3102cd3f77ae1e;hp=c25639e907bd21a194aecedc6c60a93fb4994375;hpb=0ec7dc8d19683ae292a4866c155824b647226103;p=mirror_ubuntu-zesty-kernel.git

diff --git a/fs/block_dev.c b/fs/block_dev.c
index c25639e907bd..44d4a1e9244e 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -1523,11 +1523,14 @@ static void __blkdev_put(struct block_device *bdev, fmode_t mode, int for_part)
 		WARN_ON_ONCE(bdev->bd_holders);
 		sync_blockdev(bdev);
 		kill_bdev(bdev);
+
+		bdev_write_inode(bdev);
 		/*
-		 * ->release can cause the queue to disappear, so flush all
-		 * dirty data before.
+		 * Detaching bdev inode from its wb in __destroy_inode()
+		 * is too late: the queue which embeds its bdi (along with
+		 * root wb) can be gone as soon as we put_disk() below.
 		 */
-		bdev_write_inode(bdev);
+		inode_detach_wb(bdev->bd_inode);
 	}
 	if (bdev->bd_contains == bdev) {
 		if (disk->fops->release)