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

[karo-tx-linux.git] / drivers / block / nbd.c

diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 08afbc7a2bb87171a2c4255c74705d39dd7a2b94..31e73a7a40f20eb6de0337c79aade131c4b70df4 100644 (file)
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -693,9 +693,9 @@ static void nbd_parse_flags(struct nbd_device *nbd, struct block_device *bdev)
        if (nbd->flags & NBD_FLAG_SEND_TRIM)
                queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, nbd->disk->queue);
        if (nbd->flags & NBD_FLAG_SEND_FLUSH)
-               blk_queue_flush(nbd->disk->queue, REQ_FLUSH);
+               blk_queue_write_cache(nbd->disk->queue, true, false);
        else
-               blk_queue_flush(nbd->disk->queue, 0);
+               blk_queue_write_cache(nbd->disk->queue, false, false);
 }
 
 static int nbd_dev_dbg_init(struct nbd_device *nbd);