Commit 82e094f7 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'md-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md into block-5.19 

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()
parents 957a2b34 5f7ef487

drivers/md/raid5.c

+3 −1
Original line number Diff line number Diff line
@@ -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