On 11:40, Dan Carpenter wrote: > setup_conf() can return error values so I added a check for that here. > > Signed-off-by: Dan Carpenter <error27@xxxxxxxxx> > > diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c > index 0372499..8bd7da2 100644 > --- a/drivers/md/raid10.c > +++ b/drivers/md/raid10.c > @@ -2454,6 +2454,8 @@ static void *raid10_takeover_raid0(mddev_t *mddev) > mddev->recovery_cp = MaxSector; > > conf = setup_conf(mddev); > + if (IS_ERR(conf)) > + return conf; > conf->scale_disks = 2; > return conf; > } Looks good. Feel free to add my Acked-By. BTW: setup_conf() could use some cleanup: The "couldn't allocate memory" error message at the bottom is misleading, and the function returns ERR_PTR(-ENOMEM) also if md_register_thread() fails. Here's a question for Neil: raid10_takeover_raid0() sets mddev->new_layout, but setup_conf() uses the old values of the raid0. How is this supposed to work? Thanks Andre -- The only person who always got his work done by Friday was Robinson Crusoe
Attachment:
signature.asc
Description: Digital signature
