Commit d6dfe43e authored by Chuck Lever's avatar Chuck Lever Committed by J. Bruce Fields

svcrdma: Remove svc_rdma_wq

Clean up: the system workqueue will work just as well.
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 10fa8acf
...@@ -200,7 +200,6 @@ extern struct svc_xprt_class svc_rdma_bc_class; ...@@ -200,7 +200,6 @@ extern struct svc_xprt_class svc_rdma_bc_class;
#endif #endif
/* svc_rdma.c */ /* svc_rdma.c */
extern struct workqueue_struct *svc_rdma_wq;
extern int svc_rdma_init(void); extern int svc_rdma_init(void);
extern void svc_rdma_cleanup(void); extern void svc_rdma_cleanup(void);
......
...@@ -73,8 +73,6 @@ atomic_t rdma_stat_rq_prod; ...@@ -73,8 +73,6 @@ atomic_t rdma_stat_rq_prod;
atomic_t rdma_stat_sq_poll; atomic_t rdma_stat_sq_poll;
atomic_t rdma_stat_sq_prod; atomic_t rdma_stat_sq_prod;
struct workqueue_struct *svc_rdma_wq;
/* /*
* This function implements reading and resetting an atomic_t stat * This function implements reading and resetting an atomic_t stat
* variable through read/write to a proc file. Any write to the file * variable through read/write to a proc file. Any write to the file
...@@ -230,7 +228,6 @@ static struct ctl_table svcrdma_root_table[] = { ...@@ -230,7 +228,6 @@ static struct ctl_table svcrdma_root_table[] = {
void svc_rdma_cleanup(void) void svc_rdma_cleanup(void)
{ {
dprintk("SVCRDMA Module Removed, deregister RPC RDMA transport\n"); dprintk("SVCRDMA Module Removed, deregister RPC RDMA transport\n");
destroy_workqueue(svc_rdma_wq);
if (svcrdma_table_header) { if (svcrdma_table_header) {
unregister_sysctl_table(svcrdma_table_header); unregister_sysctl_table(svcrdma_table_header);
svcrdma_table_header = NULL; svcrdma_table_header = NULL;
...@@ -246,10 +243,6 @@ int svc_rdma_init(void) ...@@ -246,10 +243,6 @@ int svc_rdma_init(void)
dprintk("\tmax_bc_requests : %u\n", svcrdma_max_bc_requests); dprintk("\tmax_bc_requests : %u\n", svcrdma_max_bc_requests);
dprintk("\tmax_inline : %d\n", svcrdma_max_req_size); dprintk("\tmax_inline : %d\n", svcrdma_max_req_size);
svc_rdma_wq = alloc_workqueue("svc_rdma", 0, 0);
if (!svc_rdma_wq)
return -ENOMEM;
if (!svcrdma_table_header) if (!svcrdma_table_header)
svcrdma_table_header = svcrdma_table_header =
register_sysctl_table(svcrdma_root_table); register_sysctl_table(svcrdma_root_table);
......
...@@ -630,8 +630,9 @@ static void svc_rdma_free(struct svc_xprt *xprt) ...@@ -630,8 +630,9 @@ static void svc_rdma_free(struct svc_xprt *xprt)
{ {
struct svcxprt_rdma *rdma = struct svcxprt_rdma *rdma =
container_of(xprt, struct svcxprt_rdma, sc_xprt); container_of(xprt, struct svcxprt_rdma, sc_xprt);
INIT_WORK(&rdma->sc_work, __svc_rdma_free); INIT_WORK(&rdma->sc_work, __svc_rdma_free);
queue_work(svc_rdma_wq, &rdma->sc_work); schedule_work(&rdma->sc_work);
} }
static int svc_rdma_has_wspace(struct svc_xprt *xprt) static int svc_rdma_has_wspace(struct svc_xprt *xprt)
......
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