diff options
Diffstat (limited to 'drivers/md/dm-raid1.c')
-rw-r--r-- | drivers/md/dm-raid1.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c index c4ce01180b6f..0d4e7e9653ff 100644 --- a/drivers/md/dm-raid1.c +++ b/drivers/md/dm-raid1.c | |||
@@ -788,7 +788,7 @@ static int recover(struct mirror_set *ms, struct region *reg) | |||
788 | { | 788 | { |
789 | int r; | 789 | int r; |
790 | unsigned int i; | 790 | unsigned int i; |
791 | struct io_region from, to[KCOPYD_MAX_REGIONS], *dest; | 791 | struct dm_io_region from, to[KCOPYD_MAX_REGIONS], *dest; |
792 | struct mirror *m; | 792 | struct mirror *m; |
793 | unsigned long flags = 0; | 793 | unsigned long flags = 0; |
794 | 794 | ||
@@ -907,7 +907,7 @@ static void map_bio(struct mirror *m, struct bio *bio) | |||
907 | bio->bi_sector = map_sector(m, bio); | 907 | bio->bi_sector = map_sector(m, bio); |
908 | } | 908 | } |
909 | 909 | ||
910 | static void map_region(struct io_region *io, struct mirror *m, | 910 | static void map_region(struct dm_io_region *io, struct mirror *m, |
911 | struct bio *bio) | 911 | struct bio *bio) |
912 | { | 912 | { |
913 | io->bdev = m->dev->bdev; | 913 | io->bdev = m->dev->bdev; |
@@ -949,7 +949,7 @@ static void read_callback(unsigned long error, void *context) | |||
949 | /* Asynchronous read. */ | 949 | /* Asynchronous read. */ |
950 | static void read_async_bio(struct mirror *m, struct bio *bio) | 950 | static void read_async_bio(struct mirror *m, struct bio *bio) |
951 | { | 951 | { |
952 | struct io_region io; | 952 | struct dm_io_region io; |
953 | struct dm_io_request io_req = { | 953 | struct dm_io_request io_req = { |
954 | .bi_rw = READ, | 954 | .bi_rw = READ, |
955 | .mem.type = DM_IO_BVEC, | 955 | .mem.type = DM_IO_BVEC, |
@@ -1105,7 +1105,7 @@ out: | |||
1105 | static void do_write(struct mirror_set *ms, struct bio *bio) | 1105 | static void do_write(struct mirror_set *ms, struct bio *bio) |
1106 | { | 1106 | { |
1107 | unsigned int i; | 1107 | unsigned int i; |
1108 | struct io_region io[ms->nr_mirrors], *dest = io; | 1108 | struct dm_io_region io[ms->nr_mirrors], *dest = io; |
1109 | struct mirror *m; | 1109 | struct mirror *m; |
1110 | struct dm_io_request io_req = { | 1110 | struct dm_io_request io_req = { |
1111 | .bi_rw = WRITE, | 1111 | .bi_rw = WRITE, |