aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/volumes.c
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.cz>2015-02-20 12:42:11 -0500
committerDavid Sterba <dsterba@suse.cz>2015-03-03 11:24:01 -0500
commit9d644a623ec48e28ca3887e616456aba63fd0558 (patch)
tree2f9bf8f9d055ecdf08cf6526b2368c45134d3af1 /fs/btrfs/volumes.c
parent47c5713f4737e460a3b2535abb8ae2e2afe2d2d0 (diff)
btrfs: cleanup, use correct type in div_u64_rem
div_u64_rem expects u32 for divisior and reminder. Signed-off-by: David Sterba <dsterba@suse.cz>
Diffstat (limited to 'fs/btrfs/volumes.c')
-rw-r--r--fs/btrfs/volumes.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index bf38ed09810a..3df83539f532 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -4953,7 +4953,7 @@ static int __btrfs_map_block(struct btrfs_fs_info *fs_info, int rw,
4953 u64 stripe_nr_orig; 4953 u64 stripe_nr_orig;
4954 u64 stripe_nr_end; 4954 u64 stripe_nr_end;
4955 u64 stripe_len; 4955 u64 stripe_len;
4956 int stripe_index; 4956 u32 stripe_index;
4957 int i; 4957 int i;
4958 int ret = 0; 4958 int ret = 0;
4959 int num_stripes; 4959 int num_stripes;
@@ -5171,7 +5171,7 @@ static int __btrfs_map_block(struct btrfs_fs_info *fs_info, int rw,
5171 } 5171 }
5172 5172
5173 } else if (map->type & BTRFS_BLOCK_GROUP_RAID10) { 5173 } else if (map->type & BTRFS_BLOCK_GROUP_RAID10) {
5174 int factor = map->num_stripes / map->sub_stripes; 5174 u32 factor = map->num_stripes / map->sub_stripes;
5175 5175
5176 stripe_nr = div_u64_rem(stripe_nr, factor, &stripe_index); 5176 stripe_nr = div_u64_rem(stripe_nr, factor, &stripe_index);
5177 stripe_index *= map->sub_stripes; 5177 stripe_index *= map->sub_stripes;
@@ -5262,7 +5262,8 @@ static int __btrfs_map_block(struct btrfs_fs_info *fs_info, int rw,
5262 need_raid_map && ((rw & (REQ_WRITE | REQ_GET_READ_MIRRORS)) || 5262 need_raid_map && ((rw & (REQ_WRITE | REQ_GET_READ_MIRRORS)) ||
5263 mirror_num > 1)) { 5263 mirror_num > 1)) {
5264 u64 tmp; 5264 u64 tmp;
5265 int i, rot; 5265 int i;
5266 unsigned rot;
5266 5267
5267 bbio->raid_map = (u64 *)((void *)bbio->stripes + 5268 bbio->raid_map = (u64 *)((void *)bbio->stripes +
5268 sizeof(struct btrfs_bio_stripe) * 5269 sizeof(struct btrfs_bio_stripe) *
@@ -5285,8 +5286,8 @@ static int __btrfs_map_block(struct btrfs_fs_info *fs_info, int rw,
5285 } 5286 }
5286 5287
5287 if (rw & REQ_DISCARD) { 5288 if (rw & REQ_DISCARD) {
5288 int factor = 0; 5289 u32 factor = 0;
5289 int sub_stripes = 0; 5290 u32 sub_stripes = 0;
5290 u64 stripes_per_dev = 0; 5291 u64 stripes_per_dev = 0;
5291 u32 remaining_stripes = 0; 5292 u32 remaining_stripes = 0;
5292 u32 last_stripe = 0; 5293 u32 last_stripe = 0;