raid10.c (b7e56edba4b02f2079042c326a8cd72a44635817) | raid10.c (086fa5ff0854c676ec333760f4c0154b3b242616) |
---|---|
1/* 2 * raid10.c : Multiple Devices driver for Linux 3 * 4 * Copyright (C) 2000-2004 Neil Brown 5 * 6 * RAID-10 support for md. 7 * 8 * Base on code in raid1.c. See raid1.c for futher copyright information. --- 1147 unchanged lines hidden (view full) --- 1156 disk_stack_limits(mddev->gendisk, rdev->bdev, 1157 rdev->data_offset << 9); 1158 /* as we don't honour merge_bvec_fn, we must never risk 1159 * violating it, so limit ->max_sector to one PAGE, as 1160 * a one page request is never in violation. 1161 */ 1162 if (rdev->bdev->bd_disk->queue->merge_bvec_fn && 1163 queue_max_sectors(mddev->queue) > (PAGE_SIZE>>9)) | 1/* 2 * raid10.c : Multiple Devices driver for Linux 3 * 4 * Copyright (C) 2000-2004 Neil Brown 5 * 6 * RAID-10 support for md. 7 * 8 * Base on code in raid1.c. See raid1.c for futher copyright information. --- 1147 unchanged lines hidden (view full) --- 1156 disk_stack_limits(mddev->gendisk, rdev->bdev, 1157 rdev->data_offset << 9); 1158 /* as we don't honour merge_bvec_fn, we must never risk 1159 * violating it, so limit ->max_sector to one PAGE, as 1160 * a one page request is never in violation. 1161 */ 1162 if (rdev->bdev->bd_disk->queue->merge_bvec_fn && 1163 queue_max_sectors(mddev->queue) > (PAGE_SIZE>>9)) |
1164 blk_queue_max_sectors(mddev->queue, PAGE_SIZE>>9); | 1164 blk_queue_max_hw_sectors(mddev->queue, PAGE_SIZE>>9); |
1165 1166 p->head_position = 0; 1167 rdev->raid_disk = mirror; 1168 err = 0; 1169 if (rdev->saved_raid_disk != mirror) 1170 conf->fullsync = 1; 1171 rcu_assign_pointer(p->rdev, rdev); 1172 break; --- 1082 unchanged lines hidden (view full) --- 2255 disk_stack_limits(mddev->gendisk, rdev->bdev, 2256 rdev->data_offset << 9); 2257 /* as we don't honour merge_bvec_fn, we must never risk 2258 * violating it, so limit ->max_sector to one PAGE, as 2259 * a one page request is never in violation. 2260 */ 2261 if (rdev->bdev->bd_disk->queue->merge_bvec_fn && 2262 queue_max_sectors(mddev->queue) > (PAGE_SIZE>>9)) | 1165 1166 p->head_position = 0; 1167 rdev->raid_disk = mirror; 1168 err = 0; 1169 if (rdev->saved_raid_disk != mirror) 1170 conf->fullsync = 1; 1171 rcu_assign_pointer(p->rdev, rdev); 1172 break; --- 1082 unchanged lines hidden (view full) --- 2255 disk_stack_limits(mddev->gendisk, rdev->bdev, 2256 rdev->data_offset << 9); 2257 /* as we don't honour merge_bvec_fn, we must never risk 2258 * violating it, so limit ->max_sector to one PAGE, as 2259 * a one page request is never in violation. 2260 */ 2261 if (rdev->bdev->bd_disk->queue->merge_bvec_fn && 2262 queue_max_sectors(mddev->queue) > (PAGE_SIZE>>9)) |
2263 blk_queue_max_sectors(mddev->queue, PAGE_SIZE>>9); | 2263 blk_queue_max_hw_sectors(mddev->queue, PAGE_SIZE>>9); |
2264 2265 disk->head_position = 0; 2266 } 2267 INIT_LIST_HEAD(&conf->retry_list); 2268 2269 spin_lock_init(&conf->resync_lock); 2270 init_waitqueue_head(&conf->wait_barrier); 2271 --- 143 unchanged lines hidden --- | 2264 2265 disk->head_position = 0; 2266 } 2267 INIT_LIST_HEAD(&conf->retry_list); 2268 2269 spin_lock_init(&conf->resync_lock); 2270 init_waitqueue_head(&conf->wait_barrier); 2271 --- 143 unchanged lines hidden --- |