block: return errors from disk_alloc_events

Prepare for proper error handling in add_disk.

Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
[hch: split from a larger patch]
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Link: https://lore.kernel.org/r/20210818144542.19305-9-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/blk.h b/block/blk.h
index c9727dd56da799f3dcc9218806ae6ee3bbdd9f41..bbbcc1a64a2dfbc4d74aa02fdb42de61d83a776b 100644 (file)
--- a/block/blk.h
+++ b/block/blk.h
@@ -362,7 +362,7 @@ int bio_add_hw_page(struct request_queue *q, struct bio *bio,
 
 struct request_queue *blk_alloc_queue(int node_id);
 
-void disk_alloc_events(struct gendisk *disk);
+int disk_alloc_events(struct gendisk *disk);
 void disk_add_events(struct gendisk *disk);
 void disk_del_events(struct gendisk *disk);
 void disk_release_events(struct gendisk *disk);

diff --git a/block/disk-events.c b/block/disk-events.c
index 7445b8ff2775f32dd16ef378a953e93ea7bc62fc..8d5496e7592a50044e288f8101b3749eeb1acf12 100644 (file)
--- a/block/disk-events.c
+++ b/block/disk-events.c
@@ -444,17 +444,17 @@ module_param_cb(events_dfl_poll_msecs, &disk_events_dfl_poll_msecs_param_ops,
 /*
  * disk_{alloc|add|del|release}_events - initialize and destroy disk_events.
  */
-void disk_alloc_events(struct gendisk *disk)
+int disk_alloc_events(struct gendisk *disk)
 {
        struct disk_events *ev;
 
        if (!disk->fops->check_events || !disk->events)
-               return;
+               return 0;
 
        ev = kzalloc(sizeof(*ev), GFP_KERNEL);
        if (!ev) {
                pr_warn("%s: failed to initialize events\n", disk->disk_name);
-               return;
+               return -ENOMEM;
        }
 
        INIT_LIST_HEAD(&ev->node);
@@ -466,6 +466,7 @@ void disk_alloc_events(struct gendisk *disk)
        INIT_DELAYED_WORK(&ev->dwork, disk_events_workfn);
 
        disk->ev = ev;
+       return 0;
 }
 
 void disk_add_events(struct gendisk *disk)