Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d1ef2f4 authored by Javier González's avatar Javier González Committed by Jens Axboe
Browse files

lightnvm: fix cleanup order of disk on init error 



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

Signed-off-by: default avatarJavier González <javier@cnexlabs.com>
Signed-off-by: default avatarMatias Bjørling <matias@cnexlabs.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent edee1bdd

drivers/lightnvm/core.c

+7 −7
Original line number Diff line number Diff line
@@ -264,15 +264,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;
@@ -308,9 +308,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: