diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-25 11:13:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-25 11:13:26 -0800 |
| commit | 638691a7a46a4ae9a7b56c603299e42d7f6e722e (patch) | |
| tree | f744b3fbdd4704ef9ae122b67a14785b4a7a6b65 /drivers/md/raid5.c | |
| parent | 0a93ea2e897bd793cc0aaaddc397eff32ac8d6fe (diff) | |
| parent | f0b4f7e2f29af678bd9af43422c537dcb6008603 (diff) | |
| download | op-kernel-dev-638691a7a46a4ae9a7b56c603299e42d7f6e722e.zip op-kernel-dev-638691a7a46a4ae9a7b56c603299e42d7f6e722e.tar.gz | |
Merge branch 'for-linus' of git://neil.brown.name/md
* 'for-linus' of git://neil.brown.name/md:
md: Fix - again - partition detection when array becomes active
Fix over-zealous flush_disk when changing device size.
md: avoid spinlock problem in blk_throtl_exit
md: correctly handle probe of an 'mdp' device.
md: don't set_capacity before array is active.
md: Fix raid1->raid0 takeover
Diffstat (limited to 'drivers/md/raid5.c')
| -rw-r--r-- | drivers/md/raid5.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 7028128..78536fd 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -5204,7 +5204,6 @@ static int run(mddev_t *mddev) mddev->queue->backing_dev_info.congested_data = mddev; mddev->queue->backing_dev_info.congested_fn = raid5_congested; - mddev->queue->queue_lock = &conf->device_lock; mddev->queue->unplug_fn = raid5_unplug_queue; chunk_size = mddev->chunk_sectors << 9; |
