X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lnet%2Fselftest%2Frpc.c;h=52a788ce5cb5d501dfb9374354a49e11fffe9709;hb=917655fc2938b90a9c246dd2d58408c42aa1658d;hp=84ee109271f0158db8d48ae072ebf94e435d68e6;hpb=4bfe21d09c39a8a2601090b8ca3e7cc7d2698140;p=fs%2Flustre-release.git diff --git a/lnet/selftest/rpc.c b/lnet/selftest/rpc.c index 84ee109..52a788c 100644 --- a/lnet/selftest/rpc.c +++ b/lnet/selftest/rpc.c @@ -113,7 +113,6 @@ srpc_free_bulk(struct srpc_bulk *bk) } LIBCFS_FREE(bk, offsetof(struct srpc_bulk, bk_iovs[bk->bk_niov])); - return; } struct srpc_bulk * @@ -760,19 +759,19 @@ srpc_shutdown_service(struct srpc_service *sv) sv->sv_id, sv->sv_name); cfs_percpt_for_each(scd, i, sv->sv_cpt_data) - spin_lock(&scd->scd_lock); + spin_lock(&scd->scd_lock); sv->sv_shuttingdown = 1; /* i.e. no new active RPC */ cfs_percpt_for_each(scd, i, sv->sv_cpt_data) - spin_unlock(&scd->scd_lock); + spin_unlock(&scd->scd_lock); cfs_percpt_for_each(scd, i, sv->sv_cpt_data) { spin_lock(&scd->scd_lock); /* schedule in-flight RPCs to notice the shutdown */ list_for_each_entry(rpc, &scd->scd_rpc_active, srpc_list) - swi_schedule_workitem(&rpc->srpc_wi); + swi_schedule_workitem(&rpc->srpc_wi); spin_unlock(&scd->scd_lock); @@ -780,7 +779,7 @@ srpc_shutdown_service(struct srpc_service *sv) * touches scd_buf_posted now */ list_for_each_entry(buf, &scd->scd_buf_posted, buf_list) - LNetMDUnlink(buf->buf_mdh); + LNetMDUnlink(buf->buf_mdh); } } @@ -953,7 +952,6 @@ srpc_server_rpc_done(struct srpc_server_rpc *rpc, int status) } spin_unlock(&scd->scd_lock); - return; } /* handles an incoming RPC */ @@ -1105,7 +1103,6 @@ srpc_add_client_rpc_timer(struct srpc_client_rpc *rpc) timer->stt_func = srpc_client_rpc_expired; timer->stt_expires = ktime_get_real_seconds() + rpc->crpc_timeout; stt_add_timer(timer); - return; } /* @@ -1169,7 +1166,6 @@ srpc_client_rpc_done(struct srpc_client_rpc *rpc, int status) spin_unlock(&rpc->crpc_lock); (*rpc->crpc_done)(rpc); - return; } /* sends an outgoing RPC */ @@ -1344,7 +1340,6 @@ srpc_abort_rpc(struct srpc_client_rpc *rpc, int why) rpc->crpc_aborted = 1; rpc->crpc_status = why; swi_schedule_workitem(&rpc->crpc_wi); - return; } /* called with rpc->crpc_lock held */ @@ -1360,7 +1355,6 @@ srpc_post_rpc(struct srpc_client_rpc *rpc) srpc_add_client_rpc_timer(rpc); swi_schedule_workitem(&rpc->crpc_wi); - return; } @@ -1694,6 +1688,4 @@ srpc_shutdown (void) case SRPC_STATE_NI_INIT: LNetNIFini(); } - - return; }