All of lore.kernel.org
 help / color / mirror / Atom feed
From: Luis Chamberlain <mcgrof@kernel.org>
To: axboe@kernel.dk, bvanassche@acm.org, ming.lei@redhat.com
Cc: yukuai3@huawei.com, linux-block@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	Luis Chamberlain <mcgrof@kernel.org>
Subject: [RFC v1 6/6] loop: add error handling support for add_disk()
Date: Wed, 29 Apr 2020 07:48:44 +0000	[thread overview]
Message-ID: <20200429074844.6241-7-mcgrof@kernel.org> (raw)
In-Reply-To: <20200429074844.6241-1-mcgrof@kernel.org>

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/loop.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 6dccba22c9b5..dcb126f3a7e1 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -2096,10 +2096,15 @@ static int loop_add(struct loop_device **l, int i)
 	disk->private_data	= lo;
 	disk->queue		= lo->lo_queue;
 	sprintf(disk->disk_name, "loop%d", i);
-	add_disk(disk);
+	err = add_disk(disk);
+	if (err)
+		goto out_put_disk;
+
 	*l = lo;
 	return lo->lo_number;
 
+out_put_disk:
+	put_disk(lo->lo_disk);
 out_free_queue:
 	blk_cleanup_queue(lo->lo_queue);
 out_cleanup_tags:
-- 
2.25.1


  parent reply	other threads:[~2020-04-29  7:49 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-29  7:48 [RFC v1 0/6] block: add error handling for *add_disk*() Luis Chamberlain
2020-04-29  7:48 ` [RFC v1 1/6] block: refcount the request_queue early in __device_add_disk() Luis Chamberlain
2020-04-29  7:48 ` [RFC v1 2/6] block: move disk announce work from register_disk() to a helper Luis Chamberlain
2020-04-29  7:48 ` [RFC v1 3/6] block: move disk invalidation from del_gendisk() into " Luis Chamberlain
2020-04-29  7:48 ` [RFC v1 4/6] block: move disk unregistration work from del_gendisk() to " Luis Chamberlain
2020-04-29  7:48 ` [RFC v1 5/6] block: add initial error handling for *add_disk()* and friends Luis Chamberlain
2020-04-29  7:48 ` Luis Chamberlain [this message]
2020-05-06  1:18 ` [RFC v1 0/6] block: add error handling for *add_disk*() Bart Van Assche
2020-05-09  3:43   ` Luis Chamberlain

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200429074844.6241-7-mcgrof@kernel.org \
    --to=mcgrof@kernel.org \
    --cc=axboe@kernel.dk \
    --cc=bvanassche@acm.org \
    --cc=linux-block@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=ming.lei@redhat.com \
    --cc=yukuai3@huawei.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.