Commit 9a7383c1 authored by NeilBrown's avatar NeilBrown Committed by Greg Kroah-Hartman

staging: lustre: discard libcfs_kvzalloc_cpt()

This function is used precisely once, and is sufficiently
trivial that it may as well be open-coded.

Doing so helpfully highlights the similarity
between the new kvzalloc_node() call and the already existing
kzalloc_node() call in the same function.
Signed-off-by: default avatarNeilBrown <neilb@suse.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6b7936ce
...@@ -113,8 +113,6 @@ static inline void *__container_of(void *ptr, unsigned long shift) ...@@ -113,8 +113,6 @@ static inline void *__container_of(void *ptr, unsigned long shift)
#define _LIBCFS_H #define _LIBCFS_H
void *libcfs_kvzalloc(size_t size, gfp_t flags); void *libcfs_kvzalloc(size_t size, gfp_t flags);
void *libcfs_kvzalloc_cpt(struct cfs_cpt_table *cptab, int cpt, size_t size,
gfp_t flags);
extern struct miscdevice libcfs_dev; extern struct miscdevice libcfs_dev;
/** /**
......
...@@ -42,10 +42,3 @@ void *libcfs_kvzalloc(size_t size, gfp_t flags) ...@@ -42,10 +42,3 @@ void *libcfs_kvzalloc(size_t size, gfp_t flags)
return ret; return ret;
} }
EXPORT_SYMBOL(libcfs_kvzalloc); EXPORT_SYMBOL(libcfs_kvzalloc);
void *libcfs_kvzalloc_cpt(struct cfs_cpt_table *cptab, int cpt, size_t size,
gfp_t flags)
{
return kvzalloc_node(size, flags, cfs_cpt_spread_node(cptab, cpt));
}
EXPORT_SYMBOL(libcfs_kvzalloc_cpt);
...@@ -83,10 +83,10 @@ ptlrpc_alloc_rqbd(struct ptlrpc_service_part *svcpt) ...@@ -83,10 +83,10 @@ ptlrpc_alloc_rqbd(struct ptlrpc_service_part *svcpt)
rqbd->rqbd_cbid.cbid_fn = request_in_callback; rqbd->rqbd_cbid.cbid_fn = request_in_callback;
rqbd->rqbd_cbid.cbid_arg = rqbd; rqbd->rqbd_cbid.cbid_arg = rqbd;
INIT_LIST_HEAD(&rqbd->rqbd_reqs); INIT_LIST_HEAD(&rqbd->rqbd_reqs);
rqbd->rqbd_buffer = libcfs_kvzalloc_cpt(svc->srv_cptable, rqbd->rqbd_buffer = kvzalloc_node(svc->srv_buf_size, GFP_KERNEL,
svcpt->scp_cpt, cfs_cpt_spread_node(svc->srv_cptable,
svc->srv_buf_size, svcpt->scp_cpt));
GFP_KERNEL);
if (!rqbd->rqbd_buffer) { if (!rqbd->rqbd_buffer) {
kfree(rqbd); kfree(rqbd);
return NULL; return NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment