diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-02 21:31:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-02 21:31:40 -0700 |
| commit | a33a052f19a21d727847391c8c1aff3fb221c472 (patch) | |
| tree | 87c6a534109fac71fb84a02bfda34c15d00878b2 /drivers/md/raid10.c | |
| parent | 4905f92ed752d49ebe9cce4fe78a4bc39e710523 (diff) | |
| parent | 449aad3e25358812c43afc60918c5ad3819488e7 (diff) | |
| download | kernel_samsung_crespo-a33a052f19a21d727847391c8c1aff3fb221c472.zip kernel_samsung_crespo-a33a052f19a21d727847391c8c1aff3fb221c472.tar.gz kernel_samsung_crespo-a33a052f19a21d727847391c8c1aff3fb221c472.tar.bz2 | |
Merge branch 'for-linus' of git://neil.brown.name/md
* 'for-linus' of git://neil.brown.name/md:
md: Use revalidate_disk to effect changes in size of device.
md: allow raid5_quiesce to work properly when reshape is happening.
md/raid5: set reshape_position correctly when reshape starts.
md: Handle growth of v1.x metadata correctly.
md: avoid array overflow with bad v1.x metadata
md: when a level change reduces the number of devices, remove the excess.
md: Push down data integrity code to personalities.
md/raid6: release spare page at ->stop()
Diffstat (limited to 'drivers/md/raid10.c')
| -rw-r--r-- | drivers/md/raid10.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c index 7298a5e..3d9020c 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c @@ -1170,6 +1170,7 @@ static int raid10_add_disk(mddev_t *mddev, mdk_rdev_t *rdev) break; } + md_integrity_add_rdev(rdev, mddev); print_conf(conf); return err; } @@ -1203,7 +1204,9 @@ static int raid10_remove_disk(mddev_t *mddev, int number) /* lost the race, try later */ err = -EBUSY; p->rdev = rdev; + goto abort; } + md_integrity_register(mddev); } abort: @@ -2225,6 +2228,7 @@ static int run(mddev_t *mddev) if (conf->near_copies < mddev->raid_disks) blk_queue_merge_bvec(mddev->queue, raid10_mergeable_bvec); + md_integrity_register(mddev); return 0; out_free_conf: |