lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Btrfs: fix __btrfs_map_block on 32 bit machines

Browse Source 
Recent changes for discard support didn't compile,
this fixes them not to try and % 64 bit numbers.

Signed-off-by: Chris Mason <chris.mason@oracle.com>
This commit is contained in:
Chris Mason
2011-03-27 21:23:21 -04:00
committed by root
parent 1561deda68
commit d9d0487932
1 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
fs/btrfs/volumes.c
View File

@@ -3126,13 +3126,19 @@ again:
if (map->type & BTRFS_BLOCK_GROUP_RAID0) { if (map->type & BTRFS_BLOCK_GROUP_RAID0) {
u64 stripes; u64 stripes;
int last_stripe = (stripe_nr_end - 1) % u32 last_stripe = 0;
map->num_stripes;
int j; int j;
div_u64_rem(stripe_nr_end - 1,
map->num_stripes,
&last_stripe);
for (j = 0; j < map->num_stripes; j++) { for (j = 0; j < map->num_stripes; j++) {
if ((stripe_nr_end - 1 - j) % u32 test;
map->num_stripes == stripe_index)
div_u64_rem(stripe_nr_end - 1 - j,
map->num_stripes, &test);
if (test == stripe_index)
break; break;
} }
stripes = stripe_nr_end - 1 - j; stripes = stripe_nr_end - 1 - j;
@@ -3153,11 +3159,19 @@ again:
int j; int j;
int factor = map->num_stripes / int factor = map->num_stripes /
map->sub_stripes; map->sub_stripes;
int last_stripe = (stripe_nr_end - 1) % factor; u32 last_stripe = 0;
div_u64_rem(stripe_nr_end - 1,
factor, &last_stripe);
last_stripe *= map->sub_stripes; last_stripe *= map->sub_stripes;
for (j = 0; j < factor; j++) { for (j = 0; j < factor; j++) {
if ((stripe_nr_end - 1 - j) % factor == u32 test;
div_u64_rem(stripe_nr_end - 1 - j,
factor, &test);
if (test ==
stripe_index / map->sub_stripes) stripe_index / map->sub_stripes)
break; break;
} }