diff options
| author | Jens Axboe <axboe@kernel.dk> | 2022-07-19 12:42:33 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2022-07-19 12:42:33 -0600 |
| commit | 82e094f7bd988c02df27f8c8d81af8f750660b2a (patch) | |
| tree | 0097e4bad8f7088c5401a6a71acd0ac05ee30fb9 | |
| parent | 957a2b345cbcf41b4b25d471229f0e35262f066c (diff) | |
| parent | 5f7ef4875f99538b741527963ffe09e869b49826 (diff) | |
Merge branch 'md-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md into block-5.19block-5.19-2022-07-21
Pull MD fix from Song.
* 'md-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md:
md/raid5: missing error code in setup_conf()
| -rw-r--r-- | drivers/md/raid5.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 5d09256d7f81..96c3a1185781 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -7304,7 +7304,9 @@ static struct r5conf *setup_conf(struct mddev *mddev) goto abort; conf->mddev = mddev; - if ((conf->stripe_hashtbl = kzalloc(PAGE_SIZE, GFP_KERNEL)) == NULL) + ret = -ENOMEM; + conf->stripe_hashtbl = kzalloc(PAGE_SIZE, GFP_KERNEL); + if (!conf->stripe_hashtbl) goto abort; /* We init hash_locks[0] separately to that it can be used |