X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmdt%2Fmdt_mds.c;h=cb28d88d3f5395a654b04d668df179262a5601d5;hb=30165c4024f8a1ee316fb192005d9b2a8b89d0b8;hp=8084dabacb85a021ed2bfa694b8dab2dbedbcd79;hpb=13787b1d87b10c693db274c4d2b718e75e88c12f;p=fs%2Flustre-release.git diff --git a/lustre/mdt/mdt_mds.c b/lustre/mdt/mdt_mds.c index 8084dab..cb28d88 100644 --- a/lustre/mdt/mdt_mds.c +++ b/lustre/mdt/mdt_mds.c @@ -99,186 +99,6 @@ static char *mds_attr_num_cpts; CFS_MODULE_PARM(mds_attr_num_cpts, "c", charp, 0444, "CPU partitions MDS setattr threads should run on"); -#define DEFINE_RPC_HANDLER(base, flags, opc, fn, fmt) \ -[opc - base] = { \ - .mh_name = #opc, \ - .mh_fail_id = OBD_FAIL_ ## opc ## _NET, \ - .mh_opc = opc, \ - .mh_flags = flags, \ - .mh_act = fn, \ - .mh_fmt = fmt \ -} - -/* Request with a format known in advance */ -#define DEF_MDT_HDL(flags, name, fn) \ - DEFINE_RPC_HANDLER(MDS_GETATTR, flags, name, fn, &RQF_ ## name) - -/* Request with a format we do not yet know */ -#define DEF_MDT_HDL_VAR(flags, name, fn) \ - DEFINE_RPC_HANDLER(MDS_GETATTR, flags, name, fn, NULL) - -/* Map one non-standard request format handler. This should probably get - * a common OBD_SET_INFO RPC opcode instead of this mismatch. */ -#define RQF_MDS_SET_INFO RQF_OBD_SET_INFO - -static struct mdt_handler mdt_mds_ops[] = { -DEF_MDT_HDL(0, MDS_CONNECT, mdt_connect), -DEF_MDT_HDL(0, MDS_DISCONNECT, mdt_disconnect), -DEF_MDT_HDL(0, MDS_SET_INFO, mdt_set_info), -DEF_MDT_HDL(0, MDS_GET_INFO, mdt_get_info), -DEF_MDT_HDL(0 | HABEO_REFERO, MDS_GETSTATUS, mdt_getstatus), -DEF_MDT_HDL(HABEO_CORPUS, MDS_GETATTR, mdt_getattr), -DEF_MDT_HDL(HABEO_CORPUS| HABEO_REFERO, MDS_GETATTR_NAME, mdt_getattr_name), -DEF_MDT_HDL(HABEO_CORPUS, MDS_GETXATTR, mdt_getxattr), -DEF_MDT_HDL(0 | HABEO_REFERO, MDS_STATFS, mdt_statfs), -DEF_MDT_HDL(0 | MUTABOR, MDS_REINT, mdt_reint), -DEF_MDT_HDL(HABEO_CORPUS, MDS_CLOSE, mdt_close), -DEF_MDT_HDL(HABEO_CORPUS, MDS_DONE_WRITING, mdt_done_writing), -DEF_MDT_HDL(0 | HABEO_REFERO, MDS_PIN, mdt_pin), -DEF_MDT_HDL_VAR(0, MDS_SYNC, mdt_sync), -DEF_MDT_HDL(HABEO_CORPUS| HABEO_REFERO, MDS_IS_SUBDIR, mdt_is_subdir), -DEF_MDT_HDL(0, MDS_QUOTACHECK, mdt_quotacheck), -DEF_MDT_HDL(0, MDS_QUOTACTL, mdt_quotactl), -DEF_MDT_HDL(HABEO_CORPUS | HABEO_REFERO | MUTABOR, MDS_HSM_PROGRESS, - mdt_hsm_progress), -DEF_MDT_HDL(HABEO_CORPUS | HABEO_REFERO | MUTABOR, MDS_HSM_CT_REGISTER, - mdt_hsm_ct_register), -DEF_MDT_HDL(HABEO_CORPUS | HABEO_REFERO | MUTABOR, MDS_HSM_CT_UNREGISTER, - mdt_hsm_ct_unregister), -DEF_MDT_HDL(HABEO_CORPUS | HABEO_REFERO, MDS_HSM_STATE_GET, mdt_hsm_state_get), -DEF_MDT_HDL(HABEO_CORPUS | HABEO_REFERO | MUTABOR, MDS_HSM_STATE_SET, - mdt_hsm_state_set), -DEF_MDT_HDL(HABEO_CORPUS | HABEO_REFERO, MDS_HSM_ACTION, mdt_hsm_action), -DEF_MDT_HDL(HABEO_CORPUS | HABEO_REFERO, MDS_HSM_REQUEST, mdt_hsm_request), -DEF_MDT_HDL(HABEO_CORPUS | HABEO_REFERO | MUTABOR, MDS_SWAP_LAYOUTS, - mdt_swap_layouts), -}; - -#define DEF_OBD_HDL(flags, name, fn) \ - DEFINE_RPC_HANDLER(OBD_PING, flags, name, fn, NULL) - -static struct mdt_handler mdt_obd_ops[] = { -DEF_OBD_HDL(0, OBD_PING, mdt_obd_ping), -DEF_OBD_HDL(0, OBD_LOG_CANCEL, mdt_obd_log_cancel), -DEF_OBD_HDL(0, OBD_QC_CALLBACK, mdt_obd_qc_callback), -DEF_OBD_HDL(0, OBD_IDX_READ, mdt_obd_idx_read) -}; - -#define DEF_DLM_HDL_VAR(flags, name, fn) \ - DEFINE_RPC_HANDLER(LDLM_ENQUEUE, flags, name, fn, NULL) -#define DEF_DLM_HDL(flags, name, fn) \ - DEFINE_RPC_HANDLER(LDLM_ENQUEUE, flags, name, fn, &RQF_ ## name) - -static struct mdt_handler mdt_dlm_ops[] = { -DEF_DLM_HDL (HABEO_CLAVIS, LDLM_ENQUEUE, mdt_enqueue), -DEF_DLM_HDL_VAR(HABEO_CLAVIS, LDLM_CONVERT, mdt_convert), -DEF_DLM_HDL_VAR(0, LDLM_BL_CALLBACK, mdt_bl_callback), -DEF_DLM_HDL_VAR(0, LDLM_CP_CALLBACK, mdt_cp_callback) -}; - -#define DEF_LLOG_HDL(flags, name, fn) \ - DEFINE_RPC_HANDLER(LLOG_ORIGIN_HANDLE_CREATE, flags, name, fn, NULL) - -static struct mdt_handler mdt_llog_ops[] = { -DEF_LLOG_HDL(0, LLOG_ORIGIN_HANDLE_CREATE, mdt_llog_create), -DEF_LLOG_HDL(0, LLOG_ORIGIN_HANDLE_NEXT_BLOCK, mdt_llog_next_block), -DEF_LLOG_HDL(0, LLOG_ORIGIN_HANDLE_READ_HEADER, mdt_llog_read_header), -DEF_LLOG_HDL(0, LLOG_ORIGIN_HANDLE_WRITE_REC, NULL), -DEF_LLOG_HDL(0, LLOG_ORIGIN_HANDLE_CLOSE, NULL), -DEF_LLOG_HDL(0, LLOG_ORIGIN_CONNECT, NULL), -DEF_LLOG_HDL(0, LLOG_CATINFO, NULL), -DEF_LLOG_HDL(0, LLOG_ORIGIN_HANDLE_PREV_BLOCK, mdt_llog_prev_block), -DEF_LLOG_HDL(0, LLOG_ORIGIN_HANDLE_DESTROY, mdt_llog_destroy), -}; - -#define DEF_SEC_HDL(flags, name, fn) \ - DEFINE_RPC_HANDLER(SEC_CTX_INIT, flags, name, fn, NULL) - -static struct mdt_handler mdt_sec_ctx_ops[] = { -DEF_SEC_HDL(0, SEC_CTX_INIT, mdt_sec_ctx_handle), -DEF_SEC_HDL(0, SEC_CTX_INIT_CONT,mdt_sec_ctx_handle), -DEF_SEC_HDL(0, SEC_CTX_FINI, mdt_sec_ctx_handle) -}; - -#define DEF_QUOTA_HDL(flags, name, fn) \ - DEFINE_RPC_HANDLER(QUOTA_DQACQ, flags, name, fn, &RQF_ ## name) - -static struct mdt_handler mdt_quota_ops[] = { -DEF_QUOTA_HDL(HABEO_REFERO, QUOTA_DQACQ, mdt_quota_dqacq), -}; - -struct mdt_opc_slice mdt_regular_handlers[] = { - { - .mos_opc_start = MDS_GETATTR, - .mos_opc_end = MDS_LAST_OPC, - .mos_hs = mdt_mds_ops - }, - { - .mos_opc_start = OBD_PING, - .mos_opc_end = OBD_LAST_OPC, - .mos_hs = mdt_obd_ops - }, - { - .mos_opc_start = LDLM_ENQUEUE, - .mos_opc_end = LDLM_LAST_OPC, - .mos_hs = mdt_dlm_ops - }, - { - .mos_opc_start = LLOG_ORIGIN_HANDLE_CREATE, - .mos_opc_end = LLOG_LAST_OPC, - .mos_hs = mdt_llog_ops - }, - { - .mos_opc_start = SEC_CTX_INIT, - .mos_opc_end = SEC_LAST_OPC, - .mos_hs = mdt_sec_ctx_ops - }, - { - .mos_opc_start = QUOTA_DQACQ, - .mos_opc_end = QUOTA_LAST_OPC, - .mos_hs = mdt_quota_ops - }, - { - .mos_hs = NULL - } -}; - -/* Readpage/readdir handlers */ -static struct mdt_handler mdt_readpage_ops[] = { -DEF_MDT_HDL(0, MDS_CONNECT, mdt_connect), -DEF_MDT_HDL(HABEO_CORPUS | HABEO_REFERO, MDS_READPAGE, mdt_readpage), -/* XXX: this is ugly and should be fixed one day, see mdc_close() for - * detailed comments. --umka */ -DEF_MDT_HDL(HABEO_CORPUS, MDS_CLOSE, mdt_close), -DEF_MDT_HDL(HABEO_CORPUS, MDS_DONE_WRITING, mdt_done_writing), -}; - -static struct mdt_opc_slice mdt_readpage_handlers[] = { - { - .mos_opc_start = MDS_GETATTR, - .mos_opc_end = MDS_LAST_OPC, - .mos_hs = mdt_readpage_ops - }, - { - .mos_opc_start = OBD_FIRST_OPC, - .mos_opc_end = OBD_LAST_OPC, - .mos_hs = mdt_obd_ops - }, - { - .mos_hs = NULL - } -}; - -static int mds_regular_handle(struct ptlrpc_request *req) -{ - return mdt_handle_common(req, mdt_regular_handlers); -} - -static int mds_readpage_handle(struct ptlrpc_request *req) -{ - return mdt_handle_common(req, mdt_readpage_handlers); -} - /* device init/fini methods */ static void mds_stop_ptlrpc_service(struct mds_device *m) { @@ -318,7 +138,7 @@ static int mds_start_ptlrpc_service(struct mds_device *m) { static struct ptlrpc_service_conf conf; struct obd_device *obd = m->mds_md_dev.md_lu_dev.ld_obd; - cfs_proc_dir_entry_t *procfs_entry; + struct proc_dir_entry *procfs_entry; int rc = 0; ENTRY; @@ -354,7 +174,7 @@ static int mds_start_ptlrpc_service(struct mds_device *m) .cc_pattern = mds_num_cpts, }, .psc_ops = { - .so_req_handler = mds_regular_handle, + .so_req_handler = tgt_request_handle, .so_req_printer = target_print_req, .so_hpreq_handler = ptlrpc_hpreq_handler, }, @@ -398,7 +218,7 @@ static int mds_start_ptlrpc_service(struct mds_device *m) .cc_pattern = mds_rdpg_num_cpts, }, .psc_ops = { - .so_req_handler = mds_readpage_handle, + .so_req_handler = tgt_request_handle, .so_req_printer = target_print_req, }, }; @@ -444,7 +264,7 @@ static int mds_start_ptlrpc_service(struct mds_device *m) .cc_pattern = mds_attr_num_cpts, }, .psc_ops = { - .so_req_handler = mds_regular_handle, + .so_req_handler = tgt_request_handle, .so_req_printer = target_print_req, .so_hpreq_handler = NULL, }, @@ -468,7 +288,7 @@ static int mds_start_ptlrpc_service(struct mds_device *m) .bc_req_max_size = OUT_MAXREQSIZE, .bc_rep_max_size = OUT_MAXREPSIZE, .bc_req_portal = OUT_PORTAL, - .bc_rep_portal = MDC_REPLY_PORTAL, + .bc_rep_portal = OSC_REPLY_PORTAL, }, /* * We'd like to have a mechanism to set this on a per-device @@ -482,7 +302,8 @@ static int mds_start_ptlrpc_service(struct mds_device *m) .tc_nthrs_max = MDS_NTHRS_MAX, .tc_nthrs_user = mds_num_threads, .tc_cpu_affinity = 1, - .tc_ctx_tags = LCT_MD_THREAD, + .tc_ctx_tags = LCT_MD_THREAD | + LCT_DT_THREAD, }, .psc_cpt = { .cc_pattern = mds_num_cpts, @@ -643,6 +464,13 @@ static struct lu_device *mds_device_free(const struct lu_env *env, RETURN(NULL); } +LPROC_SEQ_FOPS_RO_TYPE(mds, uuid); + +static struct lprocfs_seq_vars lprocfs_mds_obd_vars[] = { + { "uuid", &mds_uuid_fops }, + { 0 } +}; + static struct lu_device *mds_device_alloc(const struct lu_env *env, struct lu_device_type *t, struct lustre_cfg *cfg) @@ -666,7 +494,8 @@ static struct lu_device *mds_device_alloc(const struct lu_env *env, /* set this lu_device to obd, because error handling need it */ obd->obd_lu_dev = l; - rc = lprocfs_obd_setup(obd, lprocfs_mds_obd_vars); + obd->obd_vars = lprocfs_mds_obd_vars; + rc = lprocfs_obd_setup(obd); if (rc != 0) { mds_device_free(env, l); l = ERR_PTR(rc); @@ -711,8 +540,6 @@ static struct obd_ops mds_obd_device_ops = { int mds_mod_init(void) { - int rc; - if (mdt_num_threads != 0 && mds_num_threads == 0) { LCONSOLE_INFO("mdt_num_threads module parameter is deprecated, " "use mds_num_threads instead or unset both for " @@ -720,10 +547,8 @@ int mds_mod_init(void) mds_num_threads = mdt_num_threads; } - rc = class_register_type(&mds_obd_device_ops, NULL, - lprocfs_mds_module_vars, LUSTRE_MDS_NAME, - &mds_device_type); - return rc; + return class_register_type(&mds_obd_device_ops, NULL, true, NULL, + LUSTRE_MDS_NAME, &mds_device_type); } void mds_mod_exit(void)