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

Commit 71810ef3 authored by Chuck Lever's avatar Chuck Lever Committed by Doug Ledford
Browse files

svcrdma: Remove unused req_map and ctxt kmem_caches 



Clean up.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Acked-by: default avatarBruce Fields <bfields@fieldses.org>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 2fe81b23

include/linux/sunrpc/svc_rdma.h

+1 −0
Original line number Diff line number Diff line
@@ -242,6 +242,7 @@ extern struct svc_xprt_class svc_rdma_bc_class; 
#endif



/* svc_rdma.c */

extern struct workqueue_struct *svc_rdma_wq;

extern int svc_rdma_init(void);

extern void svc_rdma_cleanup(void);

net/sunrpc/xprtrdma/svc_rdma.c

+0 −35
Original line number Diff line number Diff line
@@ -71,10 +71,6 @@ atomic_t rdma_stat_rq_prod; 
atomic_t rdma_stat_sq_poll;

atomic_t rdma_stat_sq_prod;



/* Temporary NFS request map and context caches */

struct kmem_cache *svc_rdma_map_cachep;

struct kmem_cache *svc_rdma_ctxt_cachep;



struct workqueue_struct *svc_rdma_wq;



/*
@@ -243,8 +239,6 @@ void svc_rdma_cleanup(void) 
	svc_unreg_xprt_class(&svc_rdma_bc_class);

#endif

	svc_unreg_xprt_class(&svc_rdma_class);

	kmem_cache_destroy(svc_rdma_map_cachep);

	kmem_cache_destroy(svc_rdma_ctxt_cachep);

}



int svc_rdma_init(void)
@@ -264,39 +258,10 @@ int svc_rdma_init(void) 
		svcrdma_table_header =

			register_sysctl_table(svcrdma_root_table);



	/* Create the temporary map cache */

	svc_rdma_map_cachep = kmem_cache_create("svc_rdma_map_cache",

						sizeof(struct svc_rdma_req_map),

						0,

						SLAB_HWCACHE_ALIGN,

						NULL);

	if (!svc_rdma_map_cachep) {

		printk(KERN_INFO "Could not allocate map cache.\n");

		goto err0;

	}



	/* Create the temporary context cache */

	svc_rdma_ctxt_cachep =

		kmem_cache_create("svc_rdma_ctxt_cache",

				  sizeof(struct svc_rdma_op_ctxt),

				  0,

				  SLAB_HWCACHE_ALIGN,

				  NULL);

	if (!svc_rdma_ctxt_cachep) {

		printk(KERN_INFO "Could not allocate WR ctxt cache.\n");

		goto err1;

	}



	/* Register RDMA with the SVC transport switch */

	svc_reg_xprt_class(&svc_rdma_class);

#if defined(CONFIG_SUNRPC_BACKCHANNEL)

	svc_reg_xprt_class(&svc_rdma_bc_class);

#endif

	return 0;

 err1:

	kmem_cache_destroy(svc_rdma_map_cachep);

 err0:

	unregister_sysctl_table(svcrdma_table_header);

	destroy_workqueue(svc_rdma_wq);

	return -ENOMEM;

}

net/sunrpc/xprtrdma/xprt_rdma.h

+0 −7
Original line number Diff line number Diff line
@@ -528,11 +528,4 @@ void xprt_rdma_bc_free_rqst(struct rpc_rqst *); 
void xprt_rdma_bc_destroy(struct rpc_xprt *, unsigned int);

#endif	/* CONFIG_SUNRPC_BACKCHANNEL */



/* Temporary NFS request map cache. Created in svc_rdma.c  */

extern struct kmem_cache *svc_rdma_map_cachep;

/* WR context cache. Created in svc_rdma.c  */

extern struct kmem_cache *svc_rdma_ctxt_cachep;

/* Workqueue created in svc_rdma.c */

extern struct workqueue_struct *svc_rdma_wq;



#endif				/* _LINUX_SUNRPC_XPRT_RDMA_H */