lkml.org 
[lkml]   [2017]   [Apr]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH 2/4] lightnvm: fix cleanup order of disk on init error
From
Date
On 04/07/2017 08:31 PM, Javier González wrote:
> Reorder disk allocation such that the disk structure can be put
> safely.
>
> Signed-off-by: Javier González <javier@cnexlabs.com>
> ---
> drivers/lightnvm/core.c | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/lightnvm/core.c b/drivers/lightnvm/core.c
> index da4c082..28e69a7 100644
> --- a/drivers/lightnvm/core.c
> +++ b/drivers/lightnvm/core.c
> @@ -263,15 +263,15 @@ static int nvm_create_tgt(struct nvm_dev *dev, struct nvm_ioctl_create *create)
> goto err_t;
> }
>
> + tdisk = alloc_disk(0);
> + if (!tdisk)
> + goto err_dev;
> +
> tqueue = blk_alloc_queue_node(GFP_KERNEL, dev->q->node);
> if (!tqueue)
> - goto err_dev;
> + goto err_disk;
> blk_queue_make_request(tqueue, tt->make_rq);
>
> - tdisk = alloc_disk(0);
> - if (!tdisk)
> - goto err_queue;
> -
> sprintf(tdisk->disk_name, "%s", create->tgtname);
> tdisk->flags = GENHD_FL_EXT_DEVT;
> tdisk->major = 0;
> @@ -307,9 +307,9 @@ static int nvm_create_tgt(struct nvm_dev *dev, struct nvm_ioctl_create *create)
> if (tt->exit)
> tt->exit(targetdata);
> err_init:
> - put_disk(tdisk);
> -err_queue:
> blk_cleanup_queue(tqueue);
> +err_disk:
> + put_disk(tdisk);
> err_dev:
> nvm_remove_tgt_dev(tgt_dev, 0);
> err_t:
>
Thanks. Applied for 4.12.

\
 
 \ /
  Last update: 2017-04-11 12:44    [W:0.050 / U:0.036 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site