Skip to contentSkip to conversation

block: add __must_check for *add_disk*() callers

PATCH Applied Luis Chamberlain 3 participants 3 messages Nov 10, 2021 Block layer

lore
Share & tools
lore

Luis Chamberlain

author
#0 lore raw

PATCH 1/1 block: add __must_check for *add_disk*() callers

Now that we have done a spring cleaning on all drivers and added error checking / handling, let's keep it that way and ensure no new drivers fail to stick with it.

Reviewed-by Christoph Hellwig <[email protected]>
Signed-off-by Luis Chamberlain <[email protected]>

---

OK this is ready now as Linus has merged all the add_disk() error handling changes.

 block/genhd.c         | 6 +++---
 include/linux/genhd.h | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)
block/genhd.c +3 -3
index ca2fbab1d425..c5392cc24d37 100644
@@ -394,8 +394,8 @@ static void disk_scan_partitions(struct gendisk *disk)
  * This function registers the partitioning information in @disk
  * with the kernel.
  */
-int device_add_disk(struct device *parent, struct gendisk *disk,
-		     const struct attribute_group **groups)
+int __must_check device_add_disk(struct device *parent, struct gendisk *disk,
+				 const struct attribute_group **groups)
 
 {
 	struct device *ddev = disk_to_dev(disk);

@@ -544,7 +544,7 @@ int device_add_disk(struct device *parent, struct gendisk *disk,
 out_free_ext_minor:
 	if (disk->major == BLOCK_EXT_MAJOR)
 		blk_free_ext_minor(disk->first_minor);
-	return WARN_ON_ONCE(ret); /* keep until all callers handle errors */
+	return ret;
 }
 EXPORT_SYMBOL(device_add_disk);
include/linux/genhd.h +3 -3
index 462634b4b48f..74c410263113 100644
@@ -205,9 +205,9 @@ static inline dev_t disk_devt(struct gendisk *disk)
 void disk_uevent(struct gendisk *disk, enum kobject_action action);
 
 /* block/genhd.c */
-int device_add_disk(struct device *parent, struct gendisk *disk,
-		const struct attribute_group **groups);
-static inline int add_disk(struct gendisk *disk)
+int __must_check device_add_disk(struct device *parent, struct gendisk *disk,
+				 const struct attribute_group **groups);
+static inline int __must_check add_disk(struct gendisk *disk)
 {
 	return device_add_disk(NULL, disk, NULL);
 }
Signature · 1 line
2.33.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 3 lines · Luis Chamberlain

Now that we have done a spring cleaning on all drivers and added error checking / handling, let's keep it that way and ensure no new drivers fail to stick with it.

Reviewed-by Bart Van Assche <[email protected]>
maintainer Applied
#2 lore raw
In reply to Luis Chamberlain
Quoted 5 lines · Luis Chamberlain

Now that we have done a spring cleaning on all drivers and added error checking / handling, let's keep it that way and ensure no new drivers fail to stick with it.

Applied, thanks!

[1/1] block: add __must_check for *add_disk*() callers

      commit: 278167fd2f8ffe679351605fe03e29ff3ab8db18

Best regards,

Signature · 1 line
Jens Axboe