Re: [PATCH 01/15] z2ram: add error handling support for add_disk()
From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: 2021-09-01 13:42:06
Also in:
linux-block, linux-m68k, lkml
Hi Luis, On Tue, Aug 31, 2021 at 12:10 AM Luis Chamberlain [off-list ref] 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. Only the disk is cleaned up inside z2ram_register_disk() as the caller deals with the rest. Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
Thanks for your patch!
quoted hunk ↗ jump to hunk
--- a/drivers/block/z2ram.c +++ b/drivers/block/z2ram.c@@ -318,6 +318,7 @@ static const struct blk_mq_ops z2_mq_ops = { static int z2ram_register_disk(int minor) { struct gendisk *disk; + int err; disk = blk_mq_alloc_disk(&tag_set, NULL); if (IS_ERR(disk))@@ -333,8 +334,10 @@ static int z2ram_register_disk(int minor) sprintf(disk->disk_name, "z2ram"); z2ram_gendisk[minor] = disk; - add_disk(disk); - return 0; + err = add_disk(disk); + if (err) + blk_cleaup_disk(disk);
blk_cleanup_disk()? Seems like lkp already detected this back in July...
+ return err; } static int __init z2_init(void)
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds