leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

block: return errors from disk_alloc_events

Browse Source 
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>
This commit is contained in:
Luis Chamberlain 2021-08-18 16:45:39 +02:00 committed by Jens Axboe
parent 614310c9c8
commit 92e7755ebc
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
block/blk.h
View File

@ -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); 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_add_events(struct gendisk *disk);
void disk_del_events(struct gendisk *disk); void disk_del_events(struct gendisk *disk);
void disk_release_events(struct gendisk *disk); void disk_release_events(struct gendisk *disk);

7
block/disk-events.c
View File

@ -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. * 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; struct disk_events *ev;
if (!disk->fops->check_events || !disk->events) if (!disk->fops->check_events || !disk->events)
return; return 0;
ev = kzalloc(sizeof(*ev), GFP_KERNEL); ev = kzalloc(sizeof(*ev), GFP_KERNEL);
if (!ev) { if (!ev) {
pr_warn("%s: failed to initialize events\n", disk->disk_name); pr_warn("%s: failed to initialize events\n", disk->disk_name);
return; return -ENOMEM;
} }
INIT_LIST_HEAD(&ev->node); INIT_LIST_HEAD(&ev->node);
@ -466,6 +466,7 @@ void disk_alloc_events(struct gendisk *disk)
INIT_DELAYED_WORK(&ev->dwork, disk_events_workfn); INIT_DELAYED_WORK(&ev->dwork, disk_events_workfn);
disk->ev = ev; disk->ev = ev;
return 0;
} }
void disk_add_events(struct gendisk *disk) void disk_add_events(struct gendisk *disk)