diff options
| author | Luis Chamberlain <mcgrof@kernel.org> | 2021-07-15 03:46:28 +0000 |
|---|---|---|
| committer | Luis Chamberlain <mcgrof@kernel.org> | 2021-08-17 00:04:25 -0700 |
| commit | e1e79332ea1bba0e751529b114ef9d301bf962a5 (patch) | |
| tree | 03256c69cc03e53187acca84252eca524b002045 | |
| parent | bc933298c4b19f6cc2494323ca90415cf607ff28 (diff) | |
| download | linux-e1e79332ea1bba0e751529b114ef9d301bf962a5.tar.gz | |
block: add __must_check for *add_disk*() callers20210816-add-disk-error-handling
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.
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
| -rw-r--r-- | block/genhd.c | 6 | ||||
| -rw-r--r-- | include/linux/genhd.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/block/genhd.c b/block/genhd.c index bf52185102d0e..616076150229a 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -418,8 +418,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); @@ -564,7 +564,7 @@ out_disk_release_events: 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); diff --git a/include/linux/genhd.h b/include/linux/genhd.h index 5828ecda5c492..8d78d36c424e9 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h @@ -214,9 +214,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); } |