Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-04 11:04:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

lightnvm: rename nvm_targets to nvm_tgt_type

Browse Source 
The functions nvm_register_target(), nvm_unregister_target() and
associated list refers to a target type that is being registered by a
target type module. Rename nvm_*_targets() to nvm_*_tgt_type(), so that
the intension is clear.

This enables target instances to use the _nvm_*_targets() naming.

Signed-off-by: Simon A. F. Lund <slund@cnexlabs.com>
Signed-off-by: Matias Bjørling <m@bjorling.me>
Signed-off-by: Jens Axboe <axboe@fb.com>
This commit is contained in:
Simon A. F. Lund 2016-05-06 20:03:02 +02:00 committed by Jens Axboe
parent 909049a719
commit 6063fe399d
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/lightnvm/core.c
View File

@ -30,7 +30,7 @@
#include <linux/sched/sysctl.h> #include <linux/sched/sysctl.h>
#include <uapi/linux/lightnvm.h> #include <uapi/linux/lightnvm.h>
static LIST_HEAD(nvm_targets); static LIST_HEAD(nvm_tgt_types);
static LIST_HEAD(nvm_mgrs); static LIST_HEAD(nvm_mgrs);
static LIST_HEAD(nvm_devices); static LIST_HEAD(nvm_devices);
static DECLARE_RWSEM(nvm_lock); static DECLARE_RWSEM(nvm_lock);
@ -39,14 +39,14 @@ static struct nvm_tgt_type *nvm_find_target_type(const char *name)
{ {
struct nvm_tgt_type *tt; struct nvm_tgt_type *tt;
list_for_each_entry(tt, &nvm_targets, list) list_for_each_entry(tt, &nvm_tgt_types, list)
if (!strcmp(name, tt->name)) if (!strcmp(name, tt->name))
return tt; return tt;
return NULL; return NULL;
} }
int nvm_register_target(struct nvm_tgt_type *tt) int nvm_register_tgt_type(struct nvm_tgt_type *tt)
{ {
int ret = 0; int ret = 0;
@ -54,14 +54,14 @@ int nvm_register_target(struct nvm_tgt_type *tt)
if (nvm_find_target_type(tt->name)) if (nvm_find_target_type(tt->name))
ret = -EEXIST; ret = -EEXIST;
else else
list_add(&tt->list, &nvm_targets); list_add(&tt->list, &nvm_tgt_types);
up_write(&nvm_lock); up_write(&nvm_lock);
return ret; return ret;
} }
EXPORT_SYMBOL(nvm_register_target); EXPORT_SYMBOL(nvm_register_tgt_type);
void nvm_unregister_target(struct nvm_tgt_type *tt) void nvm_unregister_tgt_type(struct nvm_tgt_type *tt)
{ {
if (!tt) if (!tt)
return; return;
@ -70,7 +70,7 @@ void nvm_unregister_target(struct nvm_tgt_type *tt)
list_del(&tt->list); list_del(&tt->list);
up_write(&nvm_lock); up_write(&nvm_lock);
} }
EXPORT_SYMBOL(nvm_unregister_target); EXPORT_SYMBOL(nvm_unregister_tgt_type);
void *nvm_dev_dma_alloc(struct nvm_dev *dev, gfp_t mem_flags, void *nvm_dev_dma_alloc(struct nvm_dev *dev, gfp_t mem_flags,
dma_addr_t *dma_handler) dma_addr_t *dma_handler)
@ -1020,7 +1020,7 @@ static long nvm_ioctl_info(struct file *file, void __user *arg)
info->version[2] = NVM_VERSION_PATCH; info->version[2] = NVM_VERSION_PATCH;
down_write(&nvm_lock); down_write(&nvm_lock);
list_for_each_entry(tt, &nvm_targets, list) { list_for_each_entry(tt, &nvm_tgt_types, list) {
struct nvm_ioctl_info_tgt *tgt = &info->tgts[tgt_iter]; struct nvm_ioctl_info_tgt *tgt = &info->tgts[tgt_iter];
tgt->version[0] = tt->version[0]; tgt->version[0] = tt->version[0];

4
drivers/lightnvm/rrpc.c
View File

@ -1469,12 +1469,12 @@ static struct nvm_tgt_type tt_rrpc = {
static int __init rrpc_module_init(void) static int __init rrpc_module_init(void)
{ {
return nvm_register_target(&tt_rrpc); return nvm_register_tgt_type(&tt_rrpc);
} }
static void rrpc_module_exit(void) static void rrpc_module_exit(void)
{ {
nvm_unregister_target(&tt_rrpc); nvm_unregister_tgt_type(&tt_rrpc);
} }
module_init(rrpc_module_init); module_init(rrpc_module_init);

4
include/linux/lightnvm.h
View File

@ -453,8 +453,8 @@ struct nvm_tgt_type {
struct list_head list; struct list_head list;
}; };
extern int nvm_register_target(struct nvm_tgt_type *); extern int nvm_register_tgt_type(struct nvm_tgt_type *);
extern void nvm_unregister_target(struct nvm_tgt_type *); extern void nvm_unregister_tgt_type(struct nvm_tgt_type *);
extern void *nvm_dev_dma_alloc(struct nvm_dev *, gfp_t, dma_addr_t *); extern void *nvm_dev_dma_alloc(struct nvm_dev *, gfp_t, dma_addr_t *);
extern void nvm_dev_dma_free(struct nvm_dev *, void *, dma_addr_t); extern void nvm_dev_dma_free(struct nvm_dev *, void *, dma_addr_t);