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

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

drivers/staging/lustre/include/linux/libcfs/libcfs.h

+0 −2
Original line number Diff line number Diff line
@@ -113,8 +113,6 @@ static inline void *__container_of(void *ptr, unsigned long shift) 
#define _LIBCFS_H



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;

/**

drivers/staging/lustre/lnet/libcfs/linux/linux-mem.c

+0 −7
Original line number Diff line number Diff line
@@ -42,10 +42,3 @@ void *libcfs_kvzalloc(size_t size, gfp_t flags) 
	return ret;

}

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);

drivers/staging/lustre/lustre/ptlrpc/service.c

+4 −4
Original line number Diff line number Diff line
@@ -83,10 +83,10 @@ ptlrpc_alloc_rqbd(struct ptlrpc_service_part *svcpt) 
	rqbd->rqbd_cbid.cbid_fn = request_in_callback;

	rqbd->rqbd_cbid.cbid_arg = rqbd;

	INIT_LIST_HEAD(&rqbd->rqbd_reqs);

	rqbd->rqbd_buffer = libcfs_kvzalloc_cpt(svc->srv_cptable,

						svcpt->scp_cpt,

						svc->srv_buf_size,

						GFP_KERNEL);

	rqbd->rqbd_buffer = kvzalloc_node(svc->srv_buf_size, GFP_KERNEL,

					  cfs_cpt_spread_node(svc->srv_cptable,

							      svcpt->scp_cpt));



	if (!rqbd->rqbd_buffer) {

		kfree(rqbd);

		return NULL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE