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

Commit 75b85649 authored by Javier González's avatar Javier González Committed by Jens Axboe
Browse files

lightnvm: rename dma helper functions 



Until now, the dma pool have been exclusively used to allocate the ppa
list being sent to the device. In pblk (upcoming), we use these pools to
allocate metadata too. Thus, we generalize the names of some variables
on the dma helper functions to make the code more readable.

Signed-off-by: default avatarJavier González <javier@cnexlabs.com>
Signed-off-by: default avatarMatias Bjørling <m@bjorling.me>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 003fad37

drivers/lightnvm/core.c

+8 −8
Original line number Diff line number Diff line
@@ -87,15 +87,15 @@ EXPORT_SYMBOL(nvm_unregister_tgt_type); 
void *nvm_dev_dma_alloc(struct nvm_dev *dev, gfp_t mem_flags,

							dma_addr_t *dma_handler)

{

	return dev->ops->dev_dma_alloc(dev, dev->ppalist_pool, mem_flags,

	return dev->ops->dev_dma_alloc(dev, dev->dma_pool, mem_flags,

								dma_handler);

}

EXPORT_SYMBOL(nvm_dev_dma_alloc);



void nvm_dev_dma_free(struct nvm_dev *dev, void *ppa_list,

void nvm_dev_dma_free(struct nvm_dev *dev, void *addr,

							dma_addr_t dma_handler)

{

	dev->ops->dev_dma_free(dev->ppalist_pool, ppa_list, dma_handler);

	dev->ops->dev_dma_free(dev->dma_pool, addr, dma_handler);

}

EXPORT_SYMBOL(nvm_dev_dma_free);
@@ -652,8 +652,8 @@ static int nvm_init(struct nvm_dev *dev) 


static void nvm_exit(struct nvm_dev *dev)

{

	if (dev->ppalist_pool)

		dev->ops->destroy_dma_pool(dev->ppalist_pool);

	if (dev->dma_pool)

		dev->ops->destroy_dma_pool(dev->dma_pool);

	nvm_free(dev);



	pr_info("nvm: successfully unloaded\n");
@@ -687,9 +687,9 @@ int nvm_register(struct request_queue *q, char *disk_name, 
	}



	if (dev->ops->max_phys_sect > 1) {

		dev->ppalist_pool = dev->ops->create_dma_pool(dev, "ppalist");

		if (!dev->ppalist_pool) {

			pr_err("nvm: could not create ppa pool\n");

		dev->dma_pool = dev->ops->create_dma_pool(dev, "ppalist");

		if (!dev->dma_pool) {

			pr_err("nvm: could not create dma pool\n");

			ret = -ENOMEM;

			goto err_init;

		}

drivers/nvme/host/lightnvm.c

+2 −2
Original line number Diff line number Diff line
@@ -565,10 +565,10 @@ static void *nvme_nvm_dev_dma_alloc(struct nvm_dev *dev, void *pool, 
	return dma_pool_alloc(pool, mem_flags, dma_handler);

}



static void nvme_nvm_dev_dma_free(void *pool, void *ppa_list,

static void nvme_nvm_dev_dma_free(void *pool, void *addr,

							dma_addr_t dma_handler)

{

	dma_pool_free(pool, ppa_list, dma_handler);

	dma_pool_free(pool, addr, dma_handler);

}



static struct nvm_dev_ops nvme_nvm_dev_ops = {

include/linux/lightnvm.h

+1 −1
Original line number Diff line number Diff line
@@ -347,7 +347,7 @@ struct nvm_dev { 
	unsigned max_pages_per_blk;



	unsigned long *lun_map;

	void *ppalist_pool;

	void *dma_pool;



	struct nvm_id identity;