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/raid5.c | |
| parent | 5b1a4bf220a8f6f2650fdfdfebfda0f22f674d97 (diff) | |
| parent | b5470dc5fc18a8ff6517c3bb538d1479e58ecb02 (diff) | |
Merge branch 'for-neil' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/md into for-next
Diffstat (limited to 'drivers/md/raid5.c')
| -rw-r--r-- | drivers/md/raid5.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 442622067ca..8f4c70a5321 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -911,14 +911,16 @@ static int resize_stripes(raid5_conf_t *conf, int newsize) struct stripe_head *osh, *nsh; LIST_HEAD(newstripes); struct disk_info *ndisks; - int err = 0; + int err; struct kmem_cache *sc; int i; if (newsize <= conf->pool_size) return 0; /* never bother to shrink */ - md_allow_write(conf->mddev); + err = md_allow_write(conf->mddev); + if (err) + return err; /* Step 1 */ sc = kmem_cache_create(conf->cache_name[1-conf->active_name], @@ -3843,6 +3845,8 @@ raid5_store_stripe_cache_size(mddev_t *mddev, const char *page, size_t len) { raid5_conf_t *conf = mddev_to_conf(mddev); unsigned long new; + int err; + if (len >= PAGE_SIZE) return -EINVAL; if (!conf) @@ -3858,7 +3862,9 @@ raid5_store_stripe_cache_size(mddev_t *mddev, const char *page, size_t len) else break; } - md_allow_write(mddev); + err = md_allow_write(mddev); + if (err) + return err; while (new > conf->max_nr_stripes) { if (grow_one_stripe(conf)) conf->max_nr_stripes++; |