Skip to content

Commit d945404

Browse files
committed
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()
2 parents 4a1dcf7 + 82e094f commit d945404

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

drivers/md/raid5.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7304,7 +7304,9 @@ static struct r5conf *setup_conf(struct mddev *mddev)
73047304
goto abort;
73057305
conf->mddev = mddev;
73067306

7307-
if ((conf->stripe_hashtbl = kzalloc(PAGE_SIZE, GFP_KERNEL)) == NULL)
7307+
ret = -ENOMEM;
7308+
conf->stripe_hashtbl = kzalloc(PAGE_SIZE, GFP_KERNEL);
7309+
if (!conf->stripe_hashtbl)
73087310
goto abort;
73097311

73107312
/* We init hash_locks[0] separately to that it can be used

0 commit comments

Comments
 (0)