From 83a6c7e9a725e39b86ca89d58b38d7a804505fef Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Mon, 26 Jun 2006 00:27:36 -0700 Subject: [PATCH] --- yaml --- r: 30356 b: refs/heads/master c: 8932c2e0dcae52e73430878fd8a7a7800176eada h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/md/raid10.c | 2 +- trunk/drivers/md/raid5.c | 4 ++-- trunk/drivers/md/raid6main.c | 4 ++-- trunk/include/linux/raid/md_k.h | 3 ++- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 7b26eee5d146..fc6df0cea697 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c70810b327a247d12805554d0aa4605e257effb8 +refs/heads/master: 8932c2e0dcae52e73430878fd8a7a7800176eada diff --git a/trunk/drivers/md/raid10.c b/trunk/drivers/md/raid10.c index 1440935414e6..affeaefd4033 100644 --- a/trunk/drivers/md/raid10.c +++ b/trunk/drivers/md/raid10.c @@ -2050,7 +2050,7 @@ static int run(mddev_t *mddev) * maybe... */ { - int stripe = conf->raid_disks * mddev->chunk_size / PAGE_SIZE; + int stripe = conf->raid_disks * (mddev->chunk_size / PAGE_SIZE); stripe /= conf->near_copies; if (mddev->queue->backing_dev_info.ra_pages < 2* stripe) mddev->queue->backing_dev_info.ra_pages = 2* stripe; diff --git a/trunk/drivers/md/raid5.c b/trunk/drivers/md/raid5.c index 31843604049c..122e64e557b1 100644 --- a/trunk/drivers/md/raid5.c +++ b/trunk/drivers/md/raid5.c @@ -2382,8 +2382,8 @@ static int run(mddev_t *mddev) * 2 * (n-1) * chunksize where 'n' is the number of raid devices */ { - int stripe = (mddev->raid_disks-1) * mddev->chunk_size - / PAGE_SIZE; + int stripe = (mddev->raid_disks-1) * + (mddev->chunk_size / PAGE_SIZE); if (mddev->queue->backing_dev_info.ra_pages < 2 * stripe) mddev->queue->backing_dev_info.ra_pages = 2 * stripe; } diff --git a/trunk/drivers/md/raid6main.c b/trunk/drivers/md/raid6main.c index bc69355e0100..e53d2d96ea3a 100644 --- a/trunk/drivers/md/raid6main.c +++ b/trunk/drivers/md/raid6main.c @@ -2135,8 +2135,8 @@ static int run(mddev_t *mddev) * 2 * (n-2) * chunksize where 'n' is the number of raid devices */ { - int stripe = (mddev->raid_disks-2) * mddev->chunk_size - / PAGE_SIZE; + int stripe = (mddev->raid_disks-2) * + (mddev->chunk_size / PAGE_SIZE); if (mddev->queue->backing_dev_info.ra_pages < 2 * stripe) mddev->queue->backing_dev_info.ra_pages = 2 * stripe; } diff --git a/trunk/include/linux/raid/md_k.h b/trunk/include/linux/raid/md_k.h index e2df61f5b09a..db2ca2d9066e 100644 --- a/trunk/include/linux/raid/md_k.h +++ b/trunk/include/linux/raid/md_k.h @@ -40,7 +40,8 @@ typedef struct mdk_rdev_s mdk_rdev_t; * options passed in raidrun: */ -#define MAX_CHUNK_SIZE (4096*1024) +/* Currently this must fix in an 'int' */ +#define MAX_CHUNK_SIZE (1<<30) /* * MD's 'extended' device