Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
* 'for-linus' of git://neil.brown.name/md:
  md: deal with merge_bvec_fn in component devices better.
This commit is contained in:
Linus Torvalds 2010-03-18 16:55:24 -07:00
commit 31cc1dd344
5 changed files with 60 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/md/linear.c
View file

@ -172,12 +172,14 @@ static linear_conf_t *linear_conf(mddev_t *mddev, int raid_disks)
disk_stack_limits(mddev->gendisk, rdev->bdev, disk_stack_limits(mddev->gendisk, rdev->bdev,
rdev->data_offset << 9); rdev->data_offset << 9);
/* as we don't honour merge_bvec_fn, we must never risk /* as we don't honour merge_bvec_fn, we must never risk
* violating it, so limit ->max_sector to one PAGE, as * violating it, so limit max_segments to 1 lying within
* a one page request is never in violation. * a single page.
*/ */
if (rdev->bdev->bd_disk->queue->merge_bvec_fn && if (rdev->bdev->bd_disk->queue->merge_bvec_fn) {
queue_max_sectors(mddev->queue) > (PAGE_SIZE>>9)) blk_queue_max_segments(mddev->queue, 1);
blk_queue_max_hw_sectors(mddev->queue, PAGE_SIZE>>9); blk_queue_segment_boundary(mddev->queue,
PAGE_CACHE_SIZE - 1);
}
conf->array_sectors += rdev->sectors; conf->array_sectors += rdev->sectors;
cnt++; cnt++;

20
drivers/md/multipath.c
View file

@ -301,14 +301,16 @@ static int multipath_add_disk(mddev_t *mddev, mdk_rdev_t *rdev)
rdev->data_offset << 9); rdev->data_offset << 9);
/* as we don't honour merge_bvec_fn, we must never risk /* as we don't honour merge_bvec_fn, we must never risk
* violating it, so limit ->max_sector to one PAGE, as * violating it, so limit ->max_segments to one, lying
* a one page request is never in violation. * within a single page.
* (Note: it is very unlikely that a device with * (Note: it is very unlikely that a device with
* merge_bvec_fn will be involved in multipath.) * merge_bvec_fn will be involved in multipath.)
*/ */
if (q->merge_bvec_fn && if (q->merge_bvec_fn) {
queue_max_sectors(q) > (PAGE_SIZE>>9)) blk_queue_max_segments(mddev->queue, 1);
blk_queue_max_hw_sectors(mddev->queue, PAGE_SIZE>>9); blk_queue_segment_boundary(mddev->queue,
PAGE_CACHE_SIZE - 1);
}
conf->working_disks++; conf->working_disks++;
mddev->degraded--; mddev->degraded--;
@ -476,9 +478,11 @@ static int multipath_run (mddev_t *mddev)
/* as we don't honour merge_bvec_fn, we must never risk /* as we don't honour merge_bvec_fn, we must never risk
* violating it, not that we ever expect a device with * violating it, not that we ever expect a device with
* a merge_bvec_fn to be involved in multipath */ * a merge_bvec_fn to be involved in multipath */
if (rdev->bdev->bd_disk->queue->merge_bvec_fn && if (rdev->bdev->bd_disk->queue->merge_bvec_fn) {
queue_max_sectors(mddev->queue) > (PAGE_SIZE>>9)) blk_queue_max_segments(mddev->queue, 1);
blk_queue_max_hw_sectors(mddev->queue, PAGE_SIZE>>9); blk_queue_segment_boundary(mddev->queue,
PAGE_CACHE_SIZE - 1);
}
if (!test_bit(Faulty, &rdev->flags)) if (!test_bit(Faulty, &rdev->flags))
conf->working_disks++; conf->working_disks++;

13
drivers/md/raid0.c
View file

@ -176,14 +176,15 @@ static int create_strip_zones(mddev_t *mddev)
disk_stack_limits(mddev->gendisk, rdev1->bdev, disk_stack_limits(mddev->gendisk, rdev1->bdev,
rdev1->data_offset << 9); rdev1->data_offset << 9);
/* as we don't honour merge_bvec_fn, we must never risk /* as we don't honour merge_bvec_fn, we must never risk
* violating it, so limit ->max_sector to one PAGE, as * violating it, so limit ->max_segments to 1, lying within
* a one page request is never in violation. * a single page.
*/ */
if (rdev1->bdev->bd_disk->queue->merge_bvec_fn && if (rdev1->bdev->bd_disk->queue->merge_bvec_fn) {
queue_max_sectors(mddev->queue) > (PAGE_SIZE>>9)) blk_queue_max_segments(mddev->queue, 1);
blk_queue_max_hw_sectors(mddev->queue, PAGE_SIZE>>9); blk_queue_segment_boundary(mddev->queue,
PAGE_CACHE_SIZE - 1);
}
if (!smallest || (rdev1->sectors < smallest->sectors)) if (!smallest || (rdev1->sectors < smallest->sectors))
smallest = rdev1; smallest = rdev1;
cnt++; cnt++;

28
drivers/md/raid1.c
View file

@ -1152,13 +1152,17 @@ static int raid1_add_disk(mddev_t *mddev, mdk_rdev_t *rdev)
disk_stack_limits(mddev->gendisk, rdev->bdev, disk_stack_limits(mddev->gendisk, rdev->bdev,
rdev->data_offset << 9); rdev->data_offset << 9);
/* as we don't honour merge_bvec_fn, we must never risk /* as we don't honour merge_bvec_fn, we must
* violating it, so limit ->max_sector to one PAGE, as * never risk violating it, so limit
* a one page request is never in violation. * ->max_segments to one lying with a single
* page, as a one page request is never in
* violation.
*/ */
if (rdev->bdev->bd_disk->queue->merge_bvec_fn && if (rdev->bdev->bd_disk->queue->merge_bvec_fn) {
queue_max_sectors(mddev->queue) > (PAGE_SIZE>>9)) blk_queue_max_segments(mddev->queue, 1);
blk_queue_max_hw_sectors(mddev->queue, PAGE_SIZE>>9); blk_queue_segment_boundary(mddev->queue,
PAGE_CACHE_SIZE - 1);
}
p->head_position = 0; p->head_position = 0;
rdev->raid_disk = mirror; rdev->raid_disk = mirror;
@ -2098,12 +2102,14 @@ static int run(mddev_t *mddev)
disk_stack_limits(mddev->gendisk, rdev->bdev, disk_stack_limits(mddev->gendisk, rdev->bdev,
rdev->data_offset << 9); rdev->data_offset << 9);
/* as we don't honour merge_bvec_fn, we must never risk /* as we don't honour merge_bvec_fn, we must never risk
* violating it, so limit ->max_sector to one PAGE, as * violating it, so limit ->max_segments to 1 lying within
* a one page request is never in violation. * a single page, as a one page request is never in violation.
*/ */
if (rdev->bdev->bd_disk->queue->merge_bvec_fn && if (rdev->bdev->bd_disk->queue->merge_bvec_fn) {
queue_max_sectors(mddev->queue) > (PAGE_SIZE>>9)) blk_queue_max_segments(mddev->queue, 1);
blk_queue_max_hw_sectors(mddev->queue, PAGE_SIZE>>9); blk_queue_segment_boundary(mddev->queue,
PAGE_CACHE_SIZE - 1);
}
} }
mddev->degraded = 0; mddev->degraded = 0;

28
drivers/md/raid10.c
View file

@ -1155,13 +1155,17 @@ static int raid10_add_disk(mddev_t *mddev, mdk_rdev_t *rdev)
disk_stack_limits(mddev->gendisk, rdev->bdev, disk_stack_limits(mddev->gendisk, rdev->bdev,
rdev->data_offset << 9); rdev->data_offset << 9);
/* as we don't honour merge_bvec_fn, we must never risk /* as we don't honour merge_bvec_fn, we must
* violating it, so limit ->max_sector to one PAGE, as * never risk violating it, so limit
* a one page request is never in violation. * ->max_segments to one lying with a single
* page, as a one page request is never in
* violation.
*/ */
if (rdev->bdev->bd_disk->queue->merge_bvec_fn && if (rdev->bdev->bd_disk->queue->merge_bvec_fn) {
queue_max_sectors(mddev->queue) > (PAGE_SIZE>>9)) blk_queue_max_segments(mddev->queue, 1);
blk_queue_max_hw_sectors(mddev->queue, PAGE_SIZE>>9); blk_queue_segment_boundary(mddev->queue,
PAGE_CACHE_SIZE - 1);
}
p->head_position = 0; p->head_position = 0;
rdev->raid_disk = mirror; rdev->raid_disk = mirror;
@ -2255,12 +2259,14 @@ static int run(mddev_t *mddev)
disk_stack_limits(mddev->gendisk, rdev->bdev, disk_stack_limits(mddev->gendisk, rdev->bdev,
rdev->data_offset << 9); rdev->data_offset << 9);
/* as we don't honour merge_bvec_fn, we must never risk /* as we don't honour merge_bvec_fn, we must never risk
* violating it, so limit ->max_sector to one PAGE, as * violating it, so limit max_segments to 1 lying
* a one page request is never in violation. * within a single page.
*/ */
if (rdev->bdev->bd_disk->queue->merge_bvec_fn && if (rdev->bdev->bd_disk->queue->merge_bvec_fn) {
queue_max_sectors(mddev->queue) > (PAGE_SIZE>>9)) blk_queue_max_segments(mddev->queue, 1);
blk_queue_max_hw_sectors(mddev->queue, PAGE_SIZE>>9); blk_queue_segment_boundary(mddev->queue,
PAGE_CACHE_SIZE - 1);
}
disk->head_position = 0; disk->head_position = 0;
} }