| Message ID | 20210901210028.1750956-6-mcgrof@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | block: fourth batch of add_disk() error handling conversions | expand |
On Wed, Sep 1, 2021 at 11:01 PM Luis Chamberlain <mcgrof@kernel.org> 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 <mcgrof@kernel.org> looks good to me. Acked-by: Jack Wang <jinpu.wang@ionos.com> > --- > drivers/block/rnbd/rnbd-clt.c | 13 +++++++++---- > 1 file changed, 9 insertions(+), 4 deletions(-) > > diff --git a/drivers/block/rnbd/rnbd-clt.c b/drivers/block/rnbd/rnbd-clt.c > index bd4a41afbbfc..1ba1c868535a 100644 > --- a/drivers/block/rnbd/rnbd-clt.c > +++ b/drivers/block/rnbd/rnbd-clt.c > @@ -1384,8 +1384,10 @@ static void setup_request_queue(struct rnbd_clt_dev *dev) > blk_queue_write_cache(dev->queue, dev->wc, dev->fua); > } > > -static void rnbd_clt_setup_gen_disk(struct rnbd_clt_dev *dev, int idx) > +static int rnbd_clt_setup_gen_disk(struct rnbd_clt_dev *dev, int idx) > { > + int err; > + > dev->gd->major = rnbd_client_major; > dev->gd->first_minor = idx << RNBD_PART_BITS; > dev->gd->minors = 1 << RNBD_PART_BITS; > @@ -1410,7 +1412,11 @@ static void rnbd_clt_setup_gen_disk(struct rnbd_clt_dev *dev, int idx) > > if (!dev->rotational) > blk_queue_flag_set(QUEUE_FLAG_NONROT, dev->queue); > - add_disk(dev->gd); > + err = add_disk(dev->gd); > + if (err) > + blk_cleanup_disk(dev->gd); > + > + return err; > } > > static int rnbd_client_setup_device(struct rnbd_clt_dev *dev) > @@ -1426,8 +1432,7 @@ static int rnbd_client_setup_device(struct rnbd_clt_dev *dev) > rnbd_init_mq_hw_queues(dev); > > setup_request_queue(dev); > - rnbd_clt_setup_gen_disk(dev, idx); > - return 0; > + return rnbd_clt_setup_gen_disk(dev, idx); > } > > static struct rnbd_clt_dev *init_dev(struct rnbd_clt_session *sess, > -- > 2.30.2 >
diff --git a/drivers/block/rnbd/rnbd-clt.c b/drivers/block/rnbd/rnbd-clt.c index bd4a41afbbfc..1ba1c868535a 100644 --- a/drivers/block/rnbd/rnbd-clt.c +++ b/drivers/block/rnbd/rnbd-clt.c @@ -1384,8 +1384,10 @@ static void setup_request_queue(struct rnbd_clt_dev *dev) blk_queue_write_cache(dev->queue, dev->wc, dev->fua); } -static void rnbd_clt_setup_gen_disk(struct rnbd_clt_dev *dev, int idx) +static int rnbd_clt_setup_gen_disk(struct rnbd_clt_dev *dev, int idx) { + int err; + dev->gd->major = rnbd_client_major; dev->gd->first_minor = idx << RNBD_PART_BITS; dev->gd->minors = 1 << RNBD_PART_BITS; @@ -1410,7 +1412,11 @@ static void rnbd_clt_setup_gen_disk(struct rnbd_clt_dev *dev, int idx) if (!dev->rotational) blk_queue_flag_set(QUEUE_FLAG_NONROT, dev->queue); - add_disk(dev->gd); + err = add_disk(dev->gd); + if (err) + blk_cleanup_disk(dev->gd); + + return err; } static int rnbd_client_setup_device(struct rnbd_clt_dev *dev) @@ -1426,8 +1432,7 @@ static int rnbd_client_setup_device(struct rnbd_clt_dev *dev) rnbd_init_mq_hw_queues(dev); setup_request_queue(dev); - rnbd_clt_setup_gen_disk(dev, idx); - return 0; + return rnbd_clt_setup_gen_disk(dev, idx); } static struct rnbd_clt_dev *init_dev(struct rnbd_clt_session *sess,
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 <mcgrof@kernel.org> --- drivers/block/rnbd/rnbd-clt.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)