Merge tag 'char-misc-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[deliverable/linux.git] / drivers / block / virtio_blk.c

diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index 28cff0d23d829ece7f2b00685b3ab089c632c5f9..42758b52768cf894119e4de41902b4de7ecdd9d3 100644 (file)
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@ -493,11 +493,7 @@ static void virtblk_update_cache_mode(struct virtio_device *vdev)
        u8 writeback = virtblk_get_cache_mode(vdev);
        struct virtio_blk *vblk = vdev->priv;
 
-       if (writeback)
-               blk_queue_flush(vblk->disk->queue, REQ_FLUSH);
-       else
-               blk_queue_flush(vblk->disk->queue, 0);
-
+       blk_queue_write_cache(vblk->disk->queue, writeback, false);
        revalidate_disk(vblk->disk);
 }