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

null_blk: Fix error path in module initialization

Browse Source 
Module couldn't release resource properly during the initialization. To
fix this issue, we will clean up the proper resource before returning.

Signed-off-by: Minfei Huang <mnfhuang@gmail.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
This commit is contained in:
Minfei Huang 2015-12-08 13:47:34 -07:00 committed by Jens Axboe
parent 4158624454
commit af096e2235
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/block/null_blk.c
View File

@ -766,7 +766,9 @@ out:
static int __init null_init(void) static int __init null_init(void)
{ {
int ret = 0;
unsigned int i; unsigned int i;
struct nullb *nullb;
if (bs > PAGE_SIZE) { if (bs > PAGE_SIZE) {
pr_warn("null_blk: invalid block size\n"); pr_warn("null_blk: invalid block size\n");
@ -808,22 +810,29 @@ static int __init null_init(void)
0, 0, NULL); 0, 0, NULL);
if (!ppa_cache) { if (!ppa_cache) {
pr_err("null_blk: unable to create ppa cache\n"); pr_err("null_blk: unable to create ppa cache\n");
return -ENOMEM; ret = -ENOMEM;
}
}
for (i = 0; i < nr_devices; i++) {
if (null_add_dev()) {
unregister_blkdev(null_major, "nullb");
goto err_ppa; goto err_ppa;
} }
} }
for (i = 0; i < nr_devices; i++) {
ret = null_add_dev();
if (ret)
goto err_dev;
}
pr_info("null: module loaded\n"); pr_info("null: module loaded\n");
return 0; return 0;
err_ppa:
err_dev:
while (!list_empty(&nullb_list)) {
nullb = list_entry(nullb_list.next, struct nullb, list);
null_del_dev(nullb);
}
kmem_cache_destroy(ppa_cache); kmem_cache_destroy(ppa_cache);
return -EINVAL; err_ppa:
unregister_blkdev(null_major, "nullb");
return ret;
} }
static void __exit null_exit(void) static void __exit null_exit(void)