aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/md
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2007-03-27 01:32:14 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-27 12:05:14 -0400
commit041ae52e265fc432ea5525b1c66720385c2d11f0 (patch)
treeb7bab39615cb591c7df82d70e3f5ad5dba200e3d /drivers/md
parent3d37890baa4ca962f8a6b77525b8f3d0698eee09 (diff)
[PATCH] md: clear the congested_fn when stopping a raid5
If this mddev and queue got reused for another array that doesn't register a congested_fn, this function would get called incorretly. Signed-off-by: Neil Brown <neilb@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/md')
-rw-r--r--drivers/md/md.c1
-rw-r--r--drivers/md/raid5.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 6c06e825cff5..a9852dbdfd66 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -3325,6 +3325,7 @@ static int do_md_stop(mddev_t * mddev, int mode)
3325 mddev->queue->merge_bvec_fn = NULL; 3325 mddev->queue->merge_bvec_fn = NULL;
3326 mddev->queue->unplug_fn = NULL; 3326 mddev->queue->unplug_fn = NULL;
3327 mddev->queue->issue_flush_fn = NULL; 3327 mddev->queue->issue_flush_fn = NULL;
3328 mddev->queue->backing_dev_info.congested_fn = NULL;
3328 if (mddev->pers->sync_request) 3329 if (mddev->pers->sync_request)
3329 sysfs_remove_group(&mddev->kobj, &md_redundancy_group); 3330 sysfs_remove_group(&mddev->kobj, &md_redundancy_group);
3330 3331
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index ae30e87bf505..4dd252864f52 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -3646,8 +3646,8 @@ static int run(mddev_t *mddev)
3646 3646
3647 mddev->queue->unplug_fn = raid5_unplug_device; 3647 mddev->queue->unplug_fn = raid5_unplug_device;
3648 mddev->queue->issue_flush_fn = raid5_issue_flush; 3648 mddev->queue->issue_flush_fn = raid5_issue_flush;
3649 mddev->queue->backing_dev_info.congested_fn = raid5_congested;
3650 mddev->queue->backing_dev_info.congested_data = mddev; 3649 mddev->queue->backing_dev_info.congested_data = mddev;
3650 mddev->queue->backing_dev_info.congested_fn = raid5_congested;
3651 3651
3652 mddev->array_size = mddev->size * (conf->previous_raid_disks - 3652 mddev->array_size = mddev->size * (conf->previous_raid_disks -
3653 conf->max_degraded); 3653 conf->max_degraded);
@@ -3678,6 +3678,7 @@ static int stop(mddev_t *mddev)
3678 mddev->thread = NULL; 3678 mddev->thread = NULL;
3679 shrink_stripes(conf); 3679 shrink_stripes(conf);
3680 kfree(conf->stripe_hashtbl); 3680 kfree(conf->stripe_hashtbl);
3681 mddev->queue->backing_dev_info.congested_fn = NULL;
3681 blk_sync_queue(mddev->queue); /* the unplug fn references 'conf'*/ 3682 blk_sync_queue(mddev->queue); /* the unplug fn references 'conf'*/
3682 sysfs_remove_group(&mddev->kobj, &raid5_attrs_group); 3683 sysfs_remove_group(&mddev->kobj, &raid5_attrs_group);
3683 kfree(conf->disks); 3684 kfree(conf->disks);