diff options
| author | Mikulas Patocka <mpatocka@redhat.com> | 2014-03-14 18:40:39 -0400 |
|---|---|---|
| committer | Mike Snitzer <snitzer@redhat.com> | 2014-06-03 13:44:06 -0400 |
| commit | e0d6609a5fe34463ae2fd48d846931f70de8b37b (patch) | |
| tree | 06dedeb8a01b4cc0a658038cfc5ab4e467a8b259 /drivers/md | |
| parent | fad01e866afdbe01a1f3ec06a39c3a8b9e197014 (diff) | |
dm: change sector_count member in clone_info from sector_t to unsigned
It is impossible to create bios with 2^23 or more sectors (the size is
stored as a 32-bit byte count in the bio). So we convert some sector_t
values to unsigned integers.
This is needed for the next commit ("dm: introduce
dm_accept_partial_bio") that replaces integer value arguments with
pointers, so the size of the integer must match.
Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/dm.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/md/dm.c b/drivers/md/dm.c index 455e64916498..368a20dd85c2 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c | |||
| @@ -1152,10 +1152,10 @@ struct clone_info { | |||
| 1152 | struct bio *bio; | 1152 | struct bio *bio; |
| 1153 | struct dm_io *io; | 1153 | struct dm_io *io; |
| 1154 | sector_t sector; | 1154 | sector_t sector; |
| 1155 | sector_t sector_count; | 1155 | unsigned sector_count; |
| 1156 | }; | 1156 | }; |
| 1157 | 1157 | ||
| 1158 | static void bio_setup_sector(struct bio *bio, sector_t sector, sector_t len) | 1158 | static void bio_setup_sector(struct bio *bio, sector_t sector, unsigned len) |
| 1159 | { | 1159 | { |
| 1160 | bio->bi_iter.bi_sector = sector; | 1160 | bio->bi_iter.bi_sector = sector; |
| 1161 | bio->bi_iter.bi_size = to_bytes(len); | 1161 | bio->bi_iter.bi_size = to_bytes(len); |
| @@ -1200,7 +1200,7 @@ static struct dm_target_io *alloc_tio(struct clone_info *ci, | |||
| 1200 | 1200 | ||
| 1201 | static void __clone_and_map_simple_bio(struct clone_info *ci, | 1201 | static void __clone_and_map_simple_bio(struct clone_info *ci, |
| 1202 | struct dm_target *ti, | 1202 | struct dm_target *ti, |
| 1203 | unsigned target_bio_nr, sector_t len) | 1203 | unsigned target_bio_nr, unsigned len) |
| 1204 | { | 1204 | { |
| 1205 | struct dm_target_io *tio = alloc_tio(ci, ti, ci->bio->bi_max_vecs, target_bio_nr); | 1205 | struct dm_target_io *tio = alloc_tio(ci, ti, ci->bio->bi_max_vecs, target_bio_nr); |
| 1206 | struct bio *clone = &tio->clone; | 1206 | struct bio *clone = &tio->clone; |
| @@ -1218,7 +1218,7 @@ static void __clone_and_map_simple_bio(struct clone_info *ci, | |||
| 1218 | } | 1218 | } |
| 1219 | 1219 | ||
| 1220 | static void __send_duplicate_bios(struct clone_info *ci, struct dm_target *ti, | 1220 | static void __send_duplicate_bios(struct clone_info *ci, struct dm_target *ti, |
| 1221 | unsigned num_bios, sector_t len) | 1221 | unsigned num_bios, unsigned len) |
| 1222 | { | 1222 | { |
| 1223 | unsigned target_bio_nr; | 1223 | unsigned target_bio_nr; |
| 1224 | 1224 | ||
| @@ -1283,7 +1283,7 @@ static int __send_changing_extent_only(struct clone_info *ci, | |||
| 1283 | is_split_required_fn is_split_required) | 1283 | is_split_required_fn is_split_required) |
| 1284 | { | 1284 | { |
| 1285 | struct dm_target *ti; | 1285 | struct dm_target *ti; |
| 1286 | sector_t len; | 1286 | unsigned len; |
| 1287 | unsigned num_bios; | 1287 | unsigned num_bios; |
| 1288 | 1288 | ||
| 1289 | do { | 1289 | do { |
| @@ -1302,9 +1302,9 @@ static int __send_changing_extent_only(struct clone_info *ci, | |||
| 1302 | return -EOPNOTSUPP; | 1302 | return -EOPNOTSUPP; |
| 1303 | 1303 | ||
| 1304 | if (is_split_required && !is_split_required(ti)) | 1304 | if (is_split_required && !is_split_required(ti)) |
| 1305 | len = min(ci->sector_count, max_io_len_target_boundary(ci->sector, ti)); | 1305 | len = min((sector_t)ci->sector_count, max_io_len_target_boundary(ci->sector, ti)); |
| 1306 | else | 1306 | else |
| 1307 | len = min(ci->sector_count, max_io_len(ci->sector, ti)); | 1307 | len = min((sector_t)ci->sector_count, max_io_len(ci->sector, ti)); |
| 1308 | 1308 | ||
| 1309 | __send_duplicate_bios(ci, ti, num_bios, len); | 1309 | __send_duplicate_bios(ci, ti, num_bios, len); |
| 1310 | 1310 | ||