Merge tag 'for-4.14/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / drivers / md / dm-log-writes.c

diff --git a/drivers/md/dm-log-writes.c b/drivers/md/dm-log-writes.c
index 09979bdb6fe3c356f662b195330d82019c649b29..8b80a9ce9ea9c17ad9b6797aa51e6763f7f9fbc3 100644 (file)
--- a/drivers/md/dm-log-writes.c
+++ b/drivers/md/dm-log-writes.c
@@ -211,7 +211,7 @@ static int write_metadata(struct log_writes_c *lc, void *entry,
        }
        bio->bi_iter.bi_size = 0;
        bio->bi_iter.bi_sector = sector;
-       bio->bi_bdev = lc->logdev->bdev;
+       bio_set_dev(bio, lc->logdev->bdev);
        bio->bi_end_io = log_end_io;
        bio->bi_private = lc;
        bio_set_op_attrs(bio, REQ_OP_WRITE, 0);
@@ -276,7 +276,7 @@ static int log_one_block(struct log_writes_c *lc,
        }
        bio->bi_iter.bi_size = 0;
        bio->bi_iter.bi_sector = sector;
-       bio->bi_bdev = lc->logdev->bdev;
+       bio_set_dev(bio, lc->logdev->bdev);
        bio->bi_end_io = log_end_io;
        bio->bi_private = lc;
        bio_set_op_attrs(bio, REQ_OP_WRITE, 0);
@@ -298,7 +298,7 @@ static int log_one_block(struct log_writes_c *lc,
                        }
                        bio->bi_iter.bi_size = 0;
                        bio->bi_iter.bi_sector = sector;
-                       bio->bi_bdev = lc->logdev->bdev;
+                       bio_set_dev(bio, lc->logdev->bdev);
                        bio->bi_end_io = log_end_io;
                        bio->bi_private = lc;
                        bio_set_op_attrs(bio, REQ_OP_WRITE, 0);
@@ -556,7 +556,7 @@ static void normal_map_bio(struct dm_target *ti, struct bio *bio)
 {
        struct log_writes_c *lc = ti->private;
 
-       bio->bi_bdev = lc->dev->bdev;
+       bio_set_dev(bio, lc->dev->bdev);
 }
 
 static int log_writes_map(struct dm_target *ti, struct bio *bio)