dm: switch to using blk_queue_write_cache()
authorJens Axboe <axboe@fb.com>
Wed, 30 Mar 2016 16:14:14 +0000 (10:14 -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/md/dm-table.c

index f9e8f0bef3323eb81f23df1d9ef12e92889d06b7..4b1ffc0abe111eb72abc3cc8964262867e65a148 100644 (file)
@@ -1506,7 +1506,7 @@ static bool dm_table_supports_discards(struct dm_table *t)
 void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q,
                               struct queue_limits *limits)
 {
-       unsigned flush = 0;
+       bool wc = false, fua = false;
 
        /*
         * Copy table's limits to the DM device's request_queue
@@ -1519,11 +1519,11 @@ void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q,
                queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, q);
 
        if (dm_table_supports_flush(t, REQ_FLUSH)) {
-               flush |= REQ_FLUSH;
+               wc = true;
                if (dm_table_supports_flush(t, REQ_FUA))
-                       flush |= REQ_FUA;
+                       fua = true;
        }
-       blk_queue_flush(q, flush);
+       blk_queue_write_cache(q, wc, fua);
 
        if (!dm_table_discard_zeroes_data(t))
                q->limits.discard_zeroes_data = 0;