Merge branch 'for-4.10/block' of git://git.kernel.dk/linux-block

[linux.git] / fs / btrfs / volumes.c

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 71a60cc014519cb2feb4dddb106458e46bf0e6a8..0d7d635d8bfbea68f1053d1d1830a3a8908c299e 100644 (file)
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -6023,7 +6023,7 @@ static void btrfs_end_bio(struct bio *bio)
                                else
                                        btrfs_dev_stat_inc(dev,
                                                BTRFS_DEV_STAT_READ_ERRS);
-                               if ((bio->bi_opf & WRITE_FLUSH) == WRITE_FLUSH)
+                               if (bio->bi_opf & REQ_PREFLUSH)
                                        btrfs_dev_stat_inc(dev,
                                                BTRFS_DEV_STAT_FLUSH_ERRS);
                                btrfs_dev_stat_print_on_error(dev);
@@ -6100,7 +6100,7 @@ static noinline void btrfs_schedule_bio(struct btrfs_root *root,
        bio->bi_next = NULL;
 
        spin_lock(&device->io_lock);
-       if (bio->bi_opf & REQ_SYNC)
+       if (op_is_sync(bio->bi_opf))
                pending_bios = &device->pending_sync_bios;
        else
                pending_bios = &device->pending_bios;