Commit 905705f0 authored by Luis Chamberlain's avatar Luis Chamberlain Committed by Jens Axboe

loop: add error handling support for add_disk()

We never checked for errors on add_disk() as this function
returned void. Now that this is fixed, use the shiny new
error handling.
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 0a593fbb
...@@ -2394,13 +2394,19 @@ static int loop_add(int i) ...@@ -2394,13 +2394,19 @@ static int loop_add(int i)
disk->event_flags = DISK_EVENT_FLAG_UEVENT; disk->event_flags = DISK_EVENT_FLAG_UEVENT;
sprintf(disk->disk_name, "loop%d", i); sprintf(disk->disk_name, "loop%d", i);
/* Make this loop device reachable from pathname. */ /* Make this loop device reachable from pathname. */
add_disk(disk); err = add_disk(disk);
if (err)
goto out_cleanup_disk;
/* Show this loop device. */ /* Show this loop device. */
mutex_lock(&loop_ctl_mutex); mutex_lock(&loop_ctl_mutex);
lo->idr_visible = true; lo->idr_visible = true;
mutex_unlock(&loop_ctl_mutex); mutex_unlock(&loop_ctl_mutex);
return i; return i;
out_cleanup_disk:
blk_cleanup_disk(disk);
out_cleanup_tags: out_cleanup_tags:
blk_mq_free_tag_set(&lo->tag_set); blk_mq_free_tag_set(&lo->tag_set);
out_free_idr: out_free_idr:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment