diff options
| author | Neil Brown <neilb@notabene.brown> | 2008-07-08 10:13:28 +1000 |
|---|---|---|
| committer | Neil Brown <neilb@notabene.brown> | 2008-07-08 10:13:28 +1000 |
| commit | 0529613a1970fef1ba82ded431e2e2ee35b658af (patch) | |
| tree | 63d9e89424fa5fe9aef6bf0b6f0ab63f4fe886be /drivers/md/raid1.c | |
| parent | 5b1a4bf220a8f6f2650fdfdfebfda0f22f674d97 (diff) | |
| parent | b5470dc5fc18a8ff6517c3bb538d1479e58ecb02 (diff) | |
| download | linux-stable-0529613a1970fef1ba82ded431e2e2ee35b658af.tar.gz linux-stable-0529613a1970fef1ba82ded431e2e2ee35b658af.tar.bz2 linux-stable-0529613a1970fef1ba82ded431e2e2ee35b658af.zip | |
Merge branch 'for-neil' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/md into for-next
Diffstat (limited to 'drivers/md/raid1.c')
| -rw-r--r-- | drivers/md/raid1.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index f05d5983efb6..491dc2d4ad5f 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c @@ -2136,7 +2136,7 @@ static int raid1_reshape(mddev_t *mddev) conf_t *conf = mddev_to_conf(mddev); int cnt, raid_disks; unsigned long flags; - int d, d2; + int d, d2, err; /* Cannot change chunk_size, layout, or level */ if (mddev->chunk_size != mddev->new_chunk || @@ -2148,7 +2148,9 @@ static int raid1_reshape(mddev_t *mddev) return -EINVAL; } - md_allow_write(mddev); + err = md_allow_write(mddev); + if (err) + return err; raid_disks = mddev->raid_disks + mddev->delta_disks; |