From abfcabf17f7e3ecd000e2d4b3084e9b2b06b748a Mon Sep 17 00:00:00 2001 From: "Alexander.Zarochentsev" Date: Tue, 19 Oct 2010 20:34:07 +0400 Subject: [PATCH] b=22417 remove obd arg from ptlrpc_start_thread i=Mikhail.Pershin i=Andew.Perepechko --- lustre/include/lustre_net.h | 5 ++--- lustre/ldlm/ldlm_lockd.c | 4 ++-- lustre/mdt/mdt_handler.c | 16 ++++++++-------- lustre/mgs/mgs_handler.c | 2 +- lustre/ost/ost_handler.c | 6 +++--- lustre/ptlrpc/service.c | 10 ++++------ 6 files changed, 20 insertions(+), 23 deletions(-) diff --git a/lustre/include/lustre_net.h b/lustre/include/lustre_net.h index 7693eef..be610d7 100644 --- a/lustre/include/lustre_net.h +++ b/lustre/include/lustre_net.h @@ -1407,8 +1407,8 @@ struct ptlrpc_service *ptlrpc_init_svc(int nbufs, int bufsize, int max_req_size, svc_hpreq_handler_t); void ptlrpc_stop_all_threads(struct ptlrpc_service *svc); -int ptlrpc_start_threads(struct obd_device *dev, struct ptlrpc_service *svc); -int ptlrpc_start_thread(struct obd_device *dev, struct ptlrpc_service *svc); +int ptlrpc_start_threads(struct ptlrpc_service *svc); +int ptlrpc_start_thread(struct ptlrpc_service *svc); int ptlrpc_unregister_service(struct ptlrpc_service *service); int liblustre_check_services (void *arg); void ptlrpc_daemonize(char *name); @@ -1430,7 +1430,6 @@ struct ptlrpc_svc_data { char *name; struct ptlrpc_service *svc; struct ptlrpc_thread *thread; - struct obd_device *dev; }; /** @} */ diff --git a/lustre/ldlm/ldlm_lockd.c b/lustre/ldlm/ldlm_lockd.c index 98f038c..19e0c86 100644 --- a/lustre/ldlm/ldlm_lockd.c +++ b/lustre/ldlm/ldlm_lockd.c @@ -2487,11 +2487,11 @@ static int ldlm_setup(void) GOTO(out_thread, rc); } - rc = ptlrpc_start_threads(NULL, ldlm_state->ldlm_cancel_service); + rc = ptlrpc_start_threads(ldlm_state->ldlm_cancel_service); if (rc) GOTO(out_thread, rc); - rc = ptlrpc_start_threads(NULL, ldlm_state->ldlm_cb_service); + rc = ptlrpc_start_threads(ldlm_state->ldlm_cb_service); if (rc) GOTO(out_thread, rc); diff --git a/lustre/mdt/mdt_handler.c b/lustre/mdt/mdt_handler.c index 6a249bb..06faa97 100644 --- a/lustre/mdt/mdt_handler.c +++ b/lustre/mdt/mdt_handler.c @@ -3894,7 +3894,7 @@ static int mdt_start_ptlrpc_service(struct mdt_device *m) if (m->mdt_regular_service == NULL) RETURN(-ENOMEM); - rc = ptlrpc_start_threads(NULL, m->mdt_regular_service); + rc = ptlrpc_start_threads(m->mdt_regular_service); if (rc) GOTO(err_mdt_svc, rc); @@ -3924,7 +3924,7 @@ static int mdt_start_ptlrpc_service(struct mdt_device *m) GOTO(err_mdt_svc, rc = -ENOMEM); } - rc = ptlrpc_start_threads(NULL, m->mdt_readpage_service); + rc = ptlrpc_start_threads(m->mdt_readpage_service); /* * setattr service configuration. @@ -3952,7 +3952,7 @@ static int mdt_start_ptlrpc_service(struct mdt_device *m) GOTO(err_mdt_svc, rc = -ENOMEM); } - rc = ptlrpc_start_threads(NULL, m->mdt_setattr_service); + rc = ptlrpc_start_threads(m->mdt_setattr_service); if (rc) GOTO(err_mdt_svc, rc); @@ -3981,7 +3981,7 @@ static int mdt_start_ptlrpc_service(struct mdt_device *m) GOTO(err_mdt_svc, rc = -ENOMEM); } - rc = ptlrpc_start_threads(NULL, m->mdt_mdsc_service); + rc = ptlrpc_start_threads(m->mdt_mdsc_service); if (rc) GOTO(err_mdt_svc, rc); @@ -4010,7 +4010,7 @@ static int mdt_start_ptlrpc_service(struct mdt_device *m) GOTO(err_mdt_svc, rc = -ENOMEM); } - rc = ptlrpc_start_threads(NULL, m->mdt_mdss_service); + rc = ptlrpc_start_threads(m->mdt_mdss_service); if (rc) GOTO(err_mdt_svc, rc); @@ -4042,7 +4042,7 @@ static int mdt_start_ptlrpc_service(struct mdt_device *m) GOTO(err_mdt_svc, rc = -ENOMEM); } - rc = ptlrpc_start_threads(NULL, m->mdt_dtss_service); + rc = ptlrpc_start_threads(m->mdt_dtss_service); if (rc) GOTO(err_mdt_svc, rc); @@ -4069,7 +4069,7 @@ static int mdt_start_ptlrpc_service(struct mdt_device *m) GOTO(err_mdt_svc, rc = -ENOMEM); } - rc = ptlrpc_start_threads(NULL, m->mdt_fld_service); + rc = ptlrpc_start_threads(m->mdt_fld_service); if (rc) GOTO(err_mdt_svc, rc); @@ -4099,7 +4099,7 @@ static int mdt_start_ptlrpc_service(struct mdt_device *m) GOTO(err_mdt_svc, rc = -ENOMEM); } - rc = ptlrpc_start_threads(NULL, m->mdt_xmds_service); + rc = ptlrpc_start_threads(m->mdt_xmds_service); if (rc) GOTO(err_mdt_svc, rc); diff --git a/lustre/mgs/mgs_handler.c b/lustre/mgs/mgs_handler.c index 476b965..b3dfef2 100644 --- a/lustre/mgs/mgs_handler.c +++ b/lustre/mgs/mgs_handler.c @@ -248,7 +248,7 @@ static int mgs_setup(struct obd_device *obd, struct lustre_cfg *lcfg) GOTO(err_llog, rc = -ENOMEM); } - rc = ptlrpc_start_threads(obd, mgs->mgs_service); + rc = ptlrpc_start_threads(mgs->mgs_service); if (rc) GOTO(err_thread, rc); diff --git a/lustre/ost/ost_handler.c b/lustre/ost/ost_handler.c index e139194..bab562a 100644 --- a/lustre/ost/ost_handler.c +++ b/lustre/ost/ost_handler.c @@ -2545,7 +2545,7 @@ static int ost_setup(struct obd_device *obd, struct lustre_cfg* lcfg) GOTO(out_lprocfs, rc = -ENOMEM); } - rc = ptlrpc_start_threads(obd, ost->ost_service); + rc = ptlrpc_start_threads(ost->ost_service); if (rc) GOTO(out_service, rc = -EINVAL); @@ -2574,7 +2574,7 @@ static int ost_setup(struct obd_device *obd, struct lustre_cfg* lcfg) GOTO(out_service, rc = -ENOMEM); } - rc = ptlrpc_start_threads(obd, ost->ost_create_service); + rc = ptlrpc_start_threads(ost->ost_create_service); if (rc) GOTO(out_create, rc = -EINVAL); @@ -2594,7 +2594,7 @@ static int ost_setup(struct obd_device *obd, struct lustre_cfg* lcfg) ost->ost_io_service->srv_init = ost_thread_init; ost->ost_io_service->srv_done = ost_thread_done; ost->ost_io_service->srv_cpu_affinity = 1; - rc = ptlrpc_start_threads(obd, ost->ost_io_service); + rc = ptlrpc_start_threads(ost->ost_io_service); if (rc) GOTO(out_io, rc = -EINVAL); diff --git a/lustre/ptlrpc/service.c b/lustre/ptlrpc/service.c index b897107..f3cf022 100644 --- a/lustre/ptlrpc/service.c +++ b/lustre/ptlrpc/service.c @@ -2046,7 +2046,6 @@ static int ptlrpc_main(void *arg) struct ptlrpc_svc_data *data = (struct ptlrpc_svc_data *)arg; struct ptlrpc_service *svc = data->svc; struct ptlrpc_thread *thread = data->thread; - struct obd_device *dev = data->dev; struct ptlrpc_reply_state *rs; struct ptlrpc_main_check_s st; #ifdef WITH_GROUP_INFO @@ -2160,7 +2159,7 @@ static int ptlrpc_main(void *arg) if (svc->srv_threads_started < svc->srv_threads_max && svc->srv_n_active_reqs >= (svc->srv_threads_started - 2)) /* Ignore return code - we tried... */ - ptlrpc_start_thread(dev, svc); + ptlrpc_start_thread(svc); /* Process all incoming reqs before handling any */ if (st.todo & PTLRPC_MAIN_IN_REQ) { @@ -2405,7 +2404,7 @@ void ptlrpc_stop_all_threads(struct ptlrpc_service *svc) EXIT; } -int ptlrpc_start_threads(struct obd_device *dev, struct ptlrpc_service *svc) +int ptlrpc_start_threads(struct ptlrpc_service *svc) { int i, rc = 0; ENTRY; @@ -2414,7 +2413,7 @@ int ptlrpc_start_threads(struct obd_device *dev, struct ptlrpc_service *svc) ptlrpc_server_handle_request */ LASSERT(svc->srv_threads_min >= 2); for (i = 0; i < svc->srv_threads_min; i++) { - rc = ptlrpc_start_thread(dev, svc); + rc = ptlrpc_start_thread(svc); /* We have enough threads, don't start more. b=15759 */ if (rc == -EMFILE) break; @@ -2428,7 +2427,7 @@ int ptlrpc_start_threads(struct obd_device *dev, struct ptlrpc_service *svc) RETURN(rc); } -int ptlrpc_start_thread(struct obd_device *dev, struct ptlrpc_service *svc) +int ptlrpc_start_thread(struct ptlrpc_service *svc) { struct l_wait_info lwi = { 0 }; struct ptlrpc_svc_data d; @@ -2467,7 +2466,6 @@ int ptlrpc_start_thread(struct obd_device *dev, struct ptlrpc_service *svc) thread->t_svc = svc; thread->t_id = id; sprintf(name, "%s_%02d", svc->srv_thread_name, id); - d.dev = dev; d.svc = svc; d.name = name; d.thread = thread; -- 1.8.3.1