Commit cfdb2069 authored Nov 10, 2023 by Luis Chamberlain Committed by Li Nan Nov 09, 2023

loop: add error handling support for add_disk()

mainline inclusion
from mainline-v5.16-rc1
commit 905705f0
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I81XCK

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=905705f083a936e49d5259e0bb539c53d5e0a9be



----------------------------------------

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: Christoph Hellwig <hch@lst.de>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
confilct:
  drivers/block/loop.c
Signed-off-by: Zhong Jinghua <zhongjinghua@huawei.com>
Signed-off-by: Li Nan <linan122@huawei.com>

parent b4310306

drivers/block/loop.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -2177,10 +2177,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_safe(disk);
		if (err)
		goto out_cleanup_disk;

		*l = lo;
		return lo->lo_number;

		out_cleanup_disk:
		blk_cleanup_disk(disk);
		out_cleanup_tags:
		blk_mq_free_tag_set(&lo->tag_set);
		out_free_idr: