diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-25 05:30:00 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-25 05:30:00 +0000 |
| commit | ee355114ec6062d00c1376b184b886a39e74fd4e (patch) | |
| tree | da9330872894208b121ac18e2abbc801b67f1509 /drivers/block/raid5.c | |
| parent | d1003cbd87479d4962fe017c0f913dde9c4d026a (diff) | |
Merge with Linux 2.4.0-test6-pre9.
Diffstat (limited to 'drivers/block/raid5.c')
| -rw-r--r-- | drivers/block/raid5.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/block/raid5.c b/drivers/block/raid5.c index a6c7b39e9..346cc2759 100644 --- a/drivers/block/raid5.c +++ b/drivers/block/raid5.c @@ -631,7 +631,7 @@ static void raid5_build_block (struct stripe_head *sh, struct buffer_head *bh, i raid5_conf_t *conf = sh->raid_conf; char *b_data; struct page *b_page; - int block = sh->sector / (sh->size >> 9); + unsigned long block = sh->sector / (sh->size >> 9); b_data = bh->b_data; b_page = bh->b_page; @@ -715,12 +715,13 @@ static int raid5_error (mddev_t *mddev, kdev_t dev) * Input: a 'big' sector number, * Output: index of the data and parity disk, and the sector # in them. */ -static unsigned long raid5_compute_sector(int r_sector, unsigned int raid_disks, +static unsigned long raid5_compute_sector(unsigned long r_sector, unsigned int raid_disks, unsigned int data_disks, unsigned int * dd_idx, unsigned int * pd_idx, raid5_conf_t *conf) { - unsigned int stripe; - int chunk_number, chunk_offset; + unsigned long stripe; + unsigned long chunk_number; + unsigned int chunk_offset; unsigned long new_sector; int sectors_per_chunk = conf->chunk_size >> 9; |