From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Wed, 1 Sep 2021 12:38:27 -0700 From: Luis Chamberlain Subject: Re: [PATCH 15/15] pd: add error handling support for add_disk() Message-ID: References: <20210830221000.179369-1-mcgrof@kernel.org> <20210830221000.179369-16-mcgrof@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210830221000.179369-16-mcgrof@kernel.org> Sender: Luis Chamberlain To: axboe@kernel.dk, justin@coraid.com, geert@linux-m68k.org, ulf.hansson@linaro.org, hare@suse.de, tj@kernel.org, philipp.reisner@linbit.com, lars.ellenberg@linbit.com, jdike@addtoit.com, richard@nod.at, anton.ivanov@cambridgegreys.com, johannes.berg@intel.com, chris.obbard@collabora.com, krisman@collabora.com, zhuyifei1999@gmail.com, thehajime@gmail.com, chris@zankel.net, jcmvbkbc@gmail.com, tim@cyberelk.net Cc: linux-xtensa@linux-xtensa.org, linux-um@lists.infradead.org, linux-m68k@lists.linux-m68k.org, drbd-dev@lists.linbit.com, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org List-ID: On Mon, Aug 30, 2021 at 03:10:00PM -0700, Luis Chamberlain wrote: > We never checked for errors on add_disk() as this function > returned void. Now that this is fixed, use the shiny new > error handling. > > Signed-off-by: Luis Chamberlain > --- > drivers/block/paride/pd.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/drivers/block/paride/pd.c b/drivers/block/paride/pd.c > index 500b89a4bdaf..226ed5c93b68 100644 > --- a/drivers/block/paride/pd.c > +++ b/drivers/block/paride/pd.c > @@ -938,8 +938,12 @@ static int pd_probe_drive(struct pd_unit *disk, int autoprobe, int port, > if (ret) > goto put_disk; > set_capacity(disk->gd, disk->capacity); > - add_disk(disk->gd); > + ret = add_disk(disk->gd); > + if (ret) > + goto cleanup_disk; > return 0; > +cleanup_disk: > + blk_cleanup_disk(&disk); This should be blk_cleanup_disk(disk->gd); Will fix up in my v2. Luis