nbd: switch to using blk_queue_write_cache()
authorJens Axboe <axboe@fb.com>
Wed, 30 Mar 2016 16:10:53 +0000 (10:10 -0600)
committerJens Axboe <axboe@fb.com>
Tue, 12 Apr 2016 22:00:39 +0000 (16:00 -0600)
Signed-off-by: Jens Axboe <axboe@fb.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
drivers/block/nbd.c

index 08afbc7..31e73a7 100644 (file)
@@ -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)
        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
        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);
 }
 
 static int nbd_dev_dbg_init(struct nbd_device *nbd);