Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-linus' of git://neil.brown.name/md
* 'for-linus' of git://neil.brown.name/md:
md/raid5: fix bug in reshape code when chunk_size decreases.
md/raid5 - avoid deadlocks in get_active_stripe during reshape
md/raid5: use conf->raid_disks in preference to mddev->raid_disk
+14
-14
+14
-14
drivers/md/raid5.c
+14
-14
drivers/md/raid5.c
···
362
362
363
363
static struct stripe_head *
364
364
get_active_stripe(raid5_conf_t *conf, sector_t sector,
365
-
int previous, int noblock)
365
+
int previous, int noblock, int noquiesce)
366
366
{
367
367
struct stripe_head *sh;
368
368
···
372
372
373
373
do {
374
374
wait_event_lock_irq(conf->wait_for_stripe,
375
-
conf->quiesce == 0,
375
+
conf->quiesce == 0 || noquiesce,
376
376
conf->device_lock, /* nothing */);
377
377
sh = __find_stripe(conf, sector, conf->generation - previous);
378
378
if (!sh) {
···
2671
2671
sector_t bn = compute_blocknr(sh, i, 1);
2672
2672
sector_t s = raid5_compute_sector(conf, bn, 0,
2673
2673
&dd_idx, NULL);
2674
-
sh2 = get_active_stripe(conf, s, 0, 1);
2674
+
sh2 = get_active_stripe(conf, s, 0, 1, 1);
2675
2675
if (sh2 == NULL)
2676
2676
/* so far only the early blocks of this stripe
2677
2677
* have been requested. When later blocks
···
2944
2944
/* Finish reconstruct operations initiated by the expansion process */
2945
2945
if (sh->reconstruct_state == reconstruct_state_result) {
2946
2946
struct stripe_head *sh2
2947
-
= get_active_stripe(conf, sh->sector, 1, 1);
2947
+
= get_active_stripe(conf, sh->sector, 1, 1, 1);
2948
2948
if (sh2 && test_bit(STRIPE_EXPAND_SOURCE, &sh2->state)) {
2949
2949
/* sh cannot be written until sh2 has been read.
2950
2950
* so arrange for sh to be delayed a little
···
3189
3189
3190
3190
if (s.expanded && test_bit(STRIPE_EXPANDING, &sh->state)) {
3191
3191
struct stripe_head *sh2
3192
-
= get_active_stripe(conf, sh->sector, 1, 1);
3192
+
= get_active_stripe(conf, sh->sector, 1, 1, 1);
3193
3193
if (sh2 && test_bit(STRIPE_EXPAND_SOURCE, &sh2->state)) {
3194
3194
/* sh cannot be written until sh2 has been read.
3195
3195
* so arrange for sh to be delayed a little
···
3288
3288
int i;
3289
3289
3290
3290
rcu_read_lock();
3291
-
for (i=0; i<mddev->raid_disks; i++) {
3291
+
for (i = 0; i < conf->raid_disks; i++) {
3292
3292
mdk_rdev_t *rdev = rcu_dereference(conf->disks[i].rdev);
3293
3293
if (rdev && !test_bit(Faulty, &rdev->flags) && atomic_read(&rdev->nr_pending)) {
3294
3294
struct request_queue *r_queue = bdev_get_queue(rdev->bdev);
···
3675
3675
(unsigned long long)logical_sector);
3676
3676
3677
3677
sh = get_active_stripe(conf, new_sector, previous,
3678
-
(bi->bi_rw&RWA_MASK));
3678
+
(bi->bi_rw&RWA_MASK), 0);
3679
3679
if (sh) {
3680
3680
if (unlikely(previous)) {
3681
3681
/* expansion might have moved on while waiting for a
···
3873
3873
for (i = 0; i < reshape_sectors; i += STRIPE_SECTORS) {
3874
3874
int j;
3875
3875
int skipped = 0;
3876
-
sh = get_active_stripe(conf, stripe_addr+i, 0, 0);
3876
+
sh = get_active_stripe(conf, stripe_addr+i, 0, 0, 1);
3877
3877
set_bit(STRIPE_EXPANDING, &sh->state);
3878
3878
atomic_inc(&conf->reshape_stripes);
3879
3879
/* If any of this stripe is beyond the end of the old
···
3916
3916
raid5_compute_sector(conf, stripe_addr*(new_data_disks),
3917
3917
1, &dd_idx, NULL);
3918
3918
last_sector =
3919
-
raid5_compute_sector(conf, ((stripe_addr+conf->chunk_size/512)
3919
+
raid5_compute_sector(conf, ((stripe_addr+reshape_sectors)
3920
3920
*(new_data_disks) - 1),
3921
3921
1, &dd_idx, NULL);
3922
3922
if (last_sector >= mddev->dev_sectors)
3923
3923
last_sector = mddev->dev_sectors - 1;
3924
3924
while (first_sector <= last_sector) {
3925
-
sh = get_active_stripe(conf, first_sector, 1, 0);
3925
+
sh = get_active_stripe(conf, first_sector, 1, 0, 1);
3926
3926
set_bit(STRIPE_EXPAND_SOURCE, &sh->state);
3927
3927
set_bit(STRIPE_HANDLE, &sh->state);
3928
3928
release_stripe(sh);
···
4022
4022
4023
4023
bitmap_cond_end_sync(mddev->bitmap, sector_nr);
4024
4024
4025
-
sh = get_active_stripe(conf, sector_nr, 0, 1);
4025
+
sh = get_active_stripe(conf, sector_nr, 0, 1, 0);
4026
4026
if (sh == NULL) {
4027
-
sh = get_active_stripe(conf, sector_nr, 0, 0);
4027
+
sh = get_active_stripe(conf, sector_nr, 0, 0, 0);
4028
4028
/* make sure we don't swamp the stripe cache if someone else
4029
4029
* is trying to get access
4030
4030
*/
···
4034
4034
* We don't need to check the 'failed' flag as when that gets set,
4035
4035
* recovery aborts.
4036
4036
*/
4037
-
for (i=0; i<mddev->raid_disks; i++)
4037
+
for (i = 0; i < conf->raid_disks; i++)
4038
4038
if (conf->disks[i].rdev == NULL)
4039
4039
still_degraded = 1;
4040
4040
···
4086
4086
/* already done this stripe */
4087
4087
continue;
4088
4088
4089
-
sh = get_active_stripe(conf, sector, 0, 1);
4089
+
sh = get_active_stripe(conf, sector, 0, 1, 0);
4090
4090
4091
4091
if (!sh) {
4092
4092
/* failed to get a stripe - must wait */