Skip to content

Commit

Permalink
md/raid5: don't record new size if resize_stripes fails.
Browse files Browse the repository at this point in the history
If any memory allocation in resize_stripes fails we will return
-ENOMEM, but in some cases we update conf->pool_size anyway.

This means that if we try again, the allocations will be assumed
to be larger than they are, and badness results.

So only update pool_size if there is no error.

This bug was introduced in 2.6.17 and the patch is suitable for
-stable.

Fixes: ad01c9e ("[PATCH] md: Allow stripes to be expanded in preparation for expanding an array")
Cc: stable@vger.kernel.org (v2.6.17+)
Signed-off-by: NeilBrown <neilb@suse.de>
  • Loading branch information
NeilBrown committed May 8, 2015
1 parent 10d82c5 commit 6e9eac2
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/md/raid5.c
Original file line number Diff line number Diff line change
Expand Up @@ -2216,7 +2216,8 @@ static int resize_stripes(struct r5conf *conf, int newsize)

conf->slab_cache = sc;
conf->active_name = 1-conf->active_name;
conf->pool_size = newsize;
if (!err)
conf->pool_size = newsize;
return err;
}

Expand Down

0 comments on commit 6e9eac2

Please sign in to comment.