Commit d945404f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'block-5.19-2022-07-21' of git://git.kernel.dk/linux-block 

Pull block fix from Jens Axboe:
 "Just a single fix for missing error propagation for an allocation
  failure in raid5"

* tag 'block-5.19-2022-07-21' of git://git.kernel.dk/linux-block:
  md/raid5: missing error code in setup_conf()
parents 4a1dcf77 82e094f7

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