Skip to content

Commit 92e7755

Browse files
mcgrofaxboe
authored andcommitted
block: return errors from disk_alloc_events
Prepare for proper error handling in add_disk. Signed-off-by: Luis Chamberlain <[email protected]> [hch: split from a larger patch] Signed-off-by: Christoph Hellwig <[email protected]> Reviewed-by: Hannes Reinecke <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jens Axboe <[email protected]>
1 parent 614310c commit 92e7755

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

block/blk.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ int bio_add_hw_page(struct request_queue *q, struct bio *bio,
362362

363363
struct request_queue *blk_alloc_queue(int node_id);
364364

365-
void disk_alloc_events(struct gendisk *disk);
365+
int disk_alloc_events(struct gendisk *disk);
366366
void disk_add_events(struct gendisk *disk);
367367
void disk_del_events(struct gendisk *disk);
368368
void disk_release_events(struct gendisk *disk);

block/disk-events.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -444,17 +444,17 @@ module_param_cb(events_dfl_poll_msecs, &disk_events_dfl_poll_msecs_param_ops,
444444
/*
445445
* disk_{alloc|add|del|release}_events - initialize and destroy disk_events.
446446
*/
447-
void disk_alloc_events(struct gendisk *disk)
447+
int disk_alloc_events(struct gendisk *disk)
448448
{
449449
struct disk_events *ev;
450450

451451
if (!disk->fops->check_events || !disk->events)
452-
return;
452+
return 0;
453453

454454
ev = kzalloc(sizeof(*ev), GFP_KERNEL);
455455
if (!ev) {
456456
pr_warn("%s: failed to initialize events\n", disk->disk_name);
457-
return;
457+
return -ENOMEM;
458458
}
459459

460460
INIT_LIST_HEAD(&ev->node);
@@ -466,6 +466,7 @@ void disk_alloc_events(struct gendisk *disk)
466466
INIT_DELAYED_WORK(&ev->dwork, disk_events_workfn);
467467

468468
disk->ev = ev;
469+
return 0;
469470
}
470471

471472
void disk_add_events(struct gendisk *disk)

0 commit comments

Comments
 (0)