btrfs: zoned: handle REQ_OP_ZONE_APPEND as writing

[sfrench/cifs-2.6.git] / fs / btrfs / volumes.c

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 10401def16efab98433aea4d9c12ef03b08f38ed..400375aaa1970fbfb9b135418dd43b96a56b993c 100644 (file)
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -6448,7 +6448,7 @@ static void btrfs_end_bio(struct bio *bio)
                        struct btrfs_device *dev = btrfs_io_bio(bio)->device;
 
                        ASSERT(dev->bdev);
-                       if (bio_op(bio) == REQ_OP_WRITE)
+                       if (btrfs_op(bio) == BTRFS_MAP_WRITE)
                                btrfs_dev_stat_inc_and_print(dev,
                                                BTRFS_DEV_STAT_WRITE_ERRS);
                        else if (!(bio->bi_opf & REQ_RAHEAD))
@@ -6561,10 +6561,10 @@ blk_status_t btrfs_map_bio(struct btrfs_fs_info *fs_info, struct bio *bio,
        atomic_set(&bbio->stripes_pending, bbio->num_stripes);
 
        if ((bbio->map_type & BTRFS_BLOCK_GROUP_RAID56_MASK) &&
-           ((bio_op(bio) == REQ_OP_WRITE) || (mirror_num > 1))) {
+           ((btrfs_op(bio) == BTRFS_MAP_WRITE) || (mirror_num > 1))) {
                /* In this case, map_length has been set to the length of
                   a single stripe; not the whole write */
-               if (bio_op(bio) == REQ_OP_WRITE) {
+               if (btrfs_op(bio) == BTRFS_MAP_WRITE) {
                        ret = raid56_parity_write(fs_info, bio, bbio,
                                                  map_length);
                } else {
@@ -6587,7 +6587,7 @@ blk_status_t btrfs_map_bio(struct btrfs_fs_info *fs_info, struct bio *bio,
                dev = bbio->stripes[dev_nr].dev;
                if (!dev || !dev->bdev || test_bit(BTRFS_DEV_STATE_MISSING,
                                                   &dev->dev_state) ||
-                   (bio_op(first_bio) == REQ_OP_WRITE &&
+                   (btrfs_op(first_bio) == BTRFS_MAP_WRITE &&
                    !test_bit(BTRFS_DEV_STATE_WRITEABLE, &dev->dev_state))) {
                        bbio_error(bbio, first_bio, logical);
                        continue;