leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'for-linus' of git://neil.brown.name/md

Browse Source 
* 'for-linus' of git://neil.brown.name/md:
  md/raid5: allow for more than 2^31 chunks.
This commit is contained in:
Linus Torvalds 2010-04-21 12:28:44 -07:00
commit 1519ae4dc7
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/md/raid5.c
View File

@ -1650,8 +1650,8 @@ static sector_t raid5_compute_sector(raid5_conf_t *conf, sector_t r_sector,
int previous, int *dd_idx, int previous, int *dd_idx,
struct stripe_head *sh) struct stripe_head *sh)
{ {
long stripe; sector_t stripe;
unsigned long chunk_number; sector_t chunk_number;
unsigned int chunk_offset; unsigned int chunk_offset;
int pd_idx, qd_idx; int pd_idx, qd_idx;
int ddf_layout = 0; int ddf_layout = 0;
@ -1671,17 +1671,12 @@ static sector_t raid5_compute_sector(raid5_conf_t *conf, sector_t r_sector,
*/ */
chunk_offset = sector_div(r_sector, sectors_per_chunk); chunk_offset = sector_div(r_sector, sectors_per_chunk);
chunk_number = r_sector; chunk_number = r_sector;
BUG_ON(r_sector != chunk_number);
/* /*
* Compute the stripe number * Compute the stripe number
*/ */
stripe = chunk_number / data_disks; stripe = chunk_number;
*dd_idx = sector_div(stripe, data_disks);
/*
* Compute the data disk and parity disk indexes inside the stripe
*/
*dd_idx = chunk_number % data_disks;
/* /*
* Select the parity disk based on the user selected algorithm. * Select the parity disk based on the user selected algorithm.
@ -1870,14 +1865,14 @@ static sector_t compute_blocknr(struct stripe_head *sh, int i, int previous)
: conf->algorithm; : conf->algorithm;
sector_t stripe; sector_t stripe;
int chunk_offset; int chunk_offset;
int chunk_number, dummy1, dd_idx = i; sector_t chunk_number;
int dummy1, dd_idx = i;
sector_t r_sector; sector_t r_sector;
struct stripe_head sh2; struct stripe_head sh2;
chunk_offset = sector_div(new_sector, sectors_per_chunk); chunk_offset = sector_div(new_sector, sectors_per_chunk);
stripe = new_sector; stripe = new_sector;
BUG_ON(new_sector != stripe);
if (i == sh->pd_idx) if (i == sh->pd_idx)
return 0; return 0;
@ -1970,7 +1965,7 @@ static sector_t compute_blocknr(struct stripe_head *sh, int i, int previous)
} }
chunk_number = stripe * data_disks + i; chunk_number = stripe * data_disks + i;
r_sector = (sector_t)chunk_number * sectors_per_chunk + chunk_offset; r_sector = chunk_number * sectors_per_chunk + chunk_offset;
check = raid5_compute_sector(conf, r_sector, check = raid5_compute_sector(conf, r_sector,
previous, &dummy1, &sh2); previous, &dummy1, &sh2);