nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

lightnvm: fix cleanup order of disk on init error

Browse source 
Reorder disk allocation such that the disk structure can be put
safely.

Signed-off-by: Javier González <javier@cnexlabs.com>
Signed-off-by: Matias Bjørling <matias@cnexlabs.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
This commit is contained in:
Javier González 2017-04-15 20:55:43 +02:00 committed by Jens Axboe
parent edee1bdd66
commit 7d1ef2f408
1 changed files with 8 additions and 8 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/lightnvm/core.c
View file

@ -264,14 +264,14 @@ static int nvm_create_tgt(struct nvm_dev *dev, struct nvm_ioctl_create *create)
goto err_t; goto err_t;
} }
tqueue = blk_alloc_queue_node(GFP_KERNEL, dev->q->node);
if (!tqueue)
goto err_dev;
blk_queue_make_request(tqueue, tt->make_rq);
tdisk = alloc_disk(0); tdisk = alloc_disk(0);
if (!tdisk) if (!tdisk)
goto err_queue; goto err_dev;
tqueue = blk_alloc_queue_node(GFP_KERNEL, dev->q->node);
if (!tqueue)
goto err_disk;
blk_queue_make_request(tqueue, tt->make_rq);
sprintf(tdisk->disk_name, "%s", create->tgtname); sprintf(tdisk->disk_name, "%s", create->tgtname);
tdisk->flags = GENHD_FL_EXT_DEVT; tdisk->flags = GENHD_FL_EXT_DEVT;
@ -308,9 +308,9 @@ static int nvm_create_tgt(struct nvm_dev *dev, struct nvm_ioctl_create *create)
if (tt->exit) if (tt->exit)
tt->exit(targetdata); tt->exit(targetdata);
err_init: err_init:
put_disk(tdisk);
err_queue:
blk_cleanup_queue(tqueue); blk_cleanup_queue(tqueue);
err_disk:
put_disk(tdisk);
err_dev: err_dev:
nvm_remove_tgt_dev(tgt_dev, 0); nvm_remove_tgt_dev(tgt_dev, 0);
err_t: err_t: