]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
btrfs: check if the device is flush capable
authorAnand Jain <anand.jain@oracle.com>
Thu, 6 Apr 2017 03:22:53 +0000 (11:22 +0800)
committerDavid Sterba <dsterba@suse.com>
Tue, 18 Apr 2017 14:13:27 +0000 (16:13 +0200)
The block layer call chain from submit_bio will check if the write cache
is enabled for the given queue before submitting the flush. This will
add a code to fail fast if its not.

Signed-off-by: Anand Jain <anand.jain@oracle.com>
Reviewed-by: David Sterba <dsterba@suse.com>
[ updated changelog to reflect current code stat, blkdev_issue_flush is
  not used yet ]
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/disk-io.c

index e070e463ad8bbc0c488d361bcf2019935181aa03..ba7bd65693a3e2ba702333b4a89398686bf18061 100644 (file)
@@ -3518,9 +3518,13 @@ static void btrfs_end_empty_barrier(struct bio *bio)
  */
 static int write_dev_flush(struct btrfs_device *device, int wait)
 {
+       struct request_queue *q = bdev_get_queue(device->bdev);
        struct bio *bio;
        int ret = 0;
 
+       if (!test_bit(QUEUE_FLAG_WC, &q->queue_flags))
+               return 0;
+
        if (wait) {
                bio = device->flush_bio;
                if (!bio)