X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fptlrpc%2Flayout.c;h=0156712c9c32e5eddc26c7a6421a4b6cc42c5ea5;hb=592c739ecaece1f854712ede8d4a049c7d249c3a;hp=4cddc07668f4ce6668b2e7ce612f662b5268d624;hpb=23fad25a5b6b1e468d05dc7e81dfb9ad00c86a16;p=fs%2Flustre-release.git diff --git a/lustre/ptlrpc/layout.c b/lustre/ptlrpc/layout.c index 4cddc07..0156712 100644 --- a/lustre/ptlrpc/layout.c +++ b/lustre/ptlrpc/layout.c @@ -1,6 +1,4 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - * +/* * GPL HEADER START * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -26,8 +24,10 @@ * GPL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. + * + * Copyright (c) 2011, 2012, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -48,9 +48,6 @@ #if !defined(__REQ_LAYOUT_USER__) -#ifndef EXPORT_SYMTAB -# define EXPORT_SYMTAB -#endif #define DEBUG_SUBSYSTEM S_RPC #ifdef __KERNEL__ @@ -72,6 +69,7 @@ #endif /* struct ptlrpc_request, lustre_msg* */ #include +#include #include #include @@ -94,6 +92,16 @@ static const struct req_msg_field *mgs_set_info[] = { &RMF_MGS_SEND_PARAM }; +static const struct req_msg_field *mgs_config_read_client[] = { + &RMF_PTLRPC_BODY, + &RMF_MGS_CONFIG_BODY +}; + +static const struct req_msg_field *mgs_config_read_server[] = { + &RMF_PTLRPC_BODY, + &RMF_MGS_CONFIG_RES +}; + static const struct req_msg_field *log_cancel_client[] = { &RMF_PTLRPC_BODY, &RMF_LOGCOOKIES @@ -114,14 +122,24 @@ static const struct req_msg_field *quotactl_only[] = { &RMF_PTLRPC_BODY, &RMF_OBD_QUOTACTL }; -static const struct req_msg_field *quota_adjust_qunit_only[] = { - &RMF_PTLRPC_BODY, - &RMF_QUOTA_ADJUST_QUNIT + +static const struct req_msg_field *quota_body_only[] = { + &RMF_PTLRPC_BODY, + &RMF_QUOTA_BODY }; -static const struct req_msg_field *qunit_data_only[] = { - &RMF_PTLRPC_BODY, - &RMF_QUNIT_DATA +static const struct req_msg_field *ldlm_intent_quota_client[] = { + &RMF_PTLRPC_BODY, + &RMF_DLM_REQ, + &RMF_LDLM_INTENT, + &RMF_QUOTA_BODY +}; + +static const struct req_msg_field *ldlm_intent_quota_server[] = { + &RMF_PTLRPC_BODY, + &RMF_DLM_REP, + &RMF_DLM_LVB, + &RMF_QUOTA_BODY }; static const struct req_msg_field *mdt_close_client[] = { @@ -276,6 +294,15 @@ static const struct req_msg_field *mds_reint_setxattr_client[] = { &RMF_EADATA }; +static const struct req_msg_field *mdt_swap_layouts[] = { + &RMF_PTLRPC_BODY, + &RMF_MDT_BODY, + &RMF_SWAP_LAYOUTS, + &RMF_CAPA1, + &RMF_CAPA2, + &RMF_DLM_REQ +}; + static const struct req_msg_field *obd_connect_client[] = { &RMF_PTLRPC_BODY, &RMF_TGTUUID, @@ -334,11 +361,23 @@ static const struct req_msg_field *ldlm_cp_callback_client[] = { &RMF_DLM_LVB }; +static const struct req_msg_field *ldlm_gl_callback_desc_client[] = { + &RMF_PTLRPC_BODY, + &RMF_DLM_REQ, + &RMF_DLM_GL_DESC +}; + static const struct req_msg_field *ldlm_gl_callback_server[] = { &RMF_PTLRPC_BODY, &RMF_DLM_LVB }; +static const struct req_msg_field *ldlm_intent_basic_client[] = { + &RMF_PTLRPC_BODY, + &RMF_DLM_REQ, + &RMF_LDLM_INTENT, +}; + static const struct req_msg_field *ldlm_intent_client[] = { &RMF_PTLRPC_BODY, &RMF_DLM_REQ, @@ -354,6 +393,13 @@ static const struct req_msg_field *ldlm_intent_server[] = { &RMF_ACL }; +static const struct req_msg_field *ldlm_intent_layout_client[] = { + &RMF_PTLRPC_BODY, + &RMF_DLM_REQ, + &RMF_LDLM_INTENT, + &RMF_LAYOUT_INTENT, + &RMF_EADATA /* for new layout to be set up */ +}; static const struct req_msg_field *ldlm_intent_open_server[] = { &RMF_PTLRPC_BODY, &RMF_DLM_REP, @@ -444,15 +490,14 @@ static const struct req_msg_field *mds_setattr_server[] = { &RMF_CAPA2 }; -static const struct req_msg_field *llog_catinfo_client[] = { - &RMF_PTLRPC_BODY, - &RMF_NAME, - &RMF_STRING +static const struct req_msg_field *mds_update_client[] = { + &RMF_PTLRPC_BODY, + &RMF_UPDATE, }; -static const struct req_msg_field *llog_catinfo_server[] = { - &RMF_PTLRPC_BODY, - &RMF_STRING +static const struct req_msg_field *mds_update_server[] = { + &RMF_PTLRPC_BODY, + &RMF_UPDATE_REPLY, }; static const struct req_msg_field *llog_origin_handle_create_client[] = { @@ -482,6 +527,16 @@ static const struct req_msg_field *llog_origin_handle_next_block_server[] = { &RMF_EADATA }; +static const struct req_msg_field *obd_idx_read_client[] = { + &RMF_PTLRPC_BODY, + &RMF_IDX_INFO +}; + +static const struct req_msg_field *obd_idx_read_server[] = { + &RMF_PTLRPC_BODY, + &RMF_IDX_INFO +}; + static const struct req_msg_field *ost_body_only[] = { &RMF_PTLRPC_BODY, &RMF_OST_BODY @@ -509,7 +564,12 @@ static const struct req_msg_field *ost_brw_client[] = { &RMF_CAPA1 }; -static const struct req_msg_field *ost_brw_server[] = { +static const struct req_msg_field *ost_brw_read_server[] = { + &RMF_PTLRPC_BODY, + &RMF_OST_BODY +}; + +static const struct req_msg_field *ost_brw_write_server[] = { &RMF_PTLRPC_BODY, &RMF_OST_BODY, &RMF_RCS @@ -530,6 +590,11 @@ static const struct req_msg_field *ost_get_last_id_server[] = { &RMF_OBD_ID }; +static const struct req_msg_field *ost_get_last_fid_server[] = { + &RMF_PTLRPC_BODY, + &RMF_OST_ID +}; + static const struct req_msg_field *ost_get_fiemap_client[] = { &RMF_PTLRPC_BODY, &RMF_FIEMAP_KEY, @@ -541,12 +606,49 @@ static const struct req_msg_field *ost_get_fiemap_server[] = { &RMF_FIEMAP_VAL }; -static const struct req_format *req_formats[] = { +static const struct req_msg_field *mdt_hsm_progress[] = { + &RMF_PTLRPC_BODY, + &RMF_MDS_HSM_PROGRESS, +}; + +static const struct req_msg_field *mdt_hsm_ct_register[] = { + &RMF_PTLRPC_BODY, + &RMF_MDS_HSM_ARCHIVE, +}; + +static const struct req_msg_field *mdt_hsm_action_server[] = { + &RMF_PTLRPC_BODY, + &RMF_MDS_HSM_CURRENT_ACTION, +}; + +static const struct req_msg_field *mdt_hsm_state_get_server[] = { + &RMF_PTLRPC_BODY, + &RMF_HSM_USER_STATE, +}; + +static const struct req_msg_field *mdt_hsm_state_set[] = { + &RMF_PTLRPC_BODY, + &RMF_MDT_BODY, + &RMF_CAPA1, + &RMF_HSM_STATE_SET, +}; + +static const struct req_msg_field *mdt_hsm_request[] = { + &RMF_PTLRPC_BODY, + &RMF_MDT_BODY, + &RMF_MDS_HSM_REQUEST, + &RMF_MDS_HSM_USER_ITEM, + &RMF_GENERIC_DATA, +}; + +static struct req_format *req_formats[] = { &RQF_OBD_PING, &RQF_OBD_SET_INFO, + &RQF_OBD_IDX_READ, &RQF_SEC_CTX, &RQF_MGS_TARGET_REG, &RQF_MGS_SET_INFO, + &RQF_MGS_CONFIG_READ, &RQF_SEQ_QUERY, &RQF_FLD_QUERY, &RQF_MDS_CONNECT, @@ -578,24 +680,34 @@ static const struct req_format *req_formats[] = { &RQF_MDS_REINT_SETXATTR, &RQF_MDS_QUOTACHECK, &RQF_MDS_QUOTACTL, - &RQF_MDS_QUOTA_DQACQ, - &RQF_QC_CALLBACK, + &RQF_MDS_HSM_PROGRESS, + &RQF_MDS_HSM_CT_REGISTER, + &RQF_MDS_HSM_CT_UNREGISTER, + &RQF_MDS_HSM_STATE_GET, + &RQF_MDS_HSM_STATE_SET, + &RQF_MDS_HSM_ACTION, + &RQF_MDS_HSM_REQUEST, + &RQF_MDS_SWAP_LAYOUTS, + &RQF_UPDATE_OBJ, + &RQF_QC_CALLBACK, &RQF_OST_CONNECT, &RQF_OST_DISCONNECT, &RQF_OST_QUOTACHECK, &RQF_OST_QUOTACTL, - &RQF_OST_QUOTA_ADJUST_QUNIT, &RQF_OST_GETATTR, &RQF_OST_SETATTR, &RQF_OST_CREATE, &RQF_OST_PUNCH, &RQF_OST_SYNC, &RQF_OST_DESTROY, - &RQF_OST_BRW, + &RQF_OST_BRW_READ, + &RQF_OST_BRW_WRITE, &RQF_OST_STATFS, &RQF_OST_SET_GRANT_INFO, &RQF_OST_GET_INFO_GENERIC, &RQF_OST_GET_INFO_LAST_ID, + &RQF_OST_GET_INFO_LAST_FID, + &RQF_OST_SET_INFO_LAST_FID, &RQF_OST_GET_INFO_FIEMAP, &RQF_LDLM_ENQUEUE, &RQF_LDLM_ENQUEUE_LVB, @@ -605,13 +717,17 @@ static const struct req_format *req_formats[] = { &RQF_LDLM_CP_CALLBACK, &RQF_LDLM_BL_CALLBACK, &RQF_LDLM_GL_CALLBACK, + &RQF_LDLM_GL_DESC_CALLBACK, &RQF_LDLM_INTENT, + &RQF_LDLM_INTENT_BASIC, + &RQF_LDLM_INTENT_LAYOUT, &RQF_LDLM_INTENT_GETATTR, &RQF_LDLM_INTENT_OPEN, &RQF_LDLM_INTENT_CREATE, &RQF_LDLM_INTENT_UNLINK, + &RQF_LDLM_INTENT_QUOTA, + &RQF_QUOTA_DQACQ, &RQF_LOG_CANCEL, - &RQF_LLOG_CATINFO, &RQF_LLOG_ORIGIN_HANDLE_CREATE, &RQF_LLOG_ORIGIN_HANDLE_DESTROY, &RQF_LLOG_ORIGIN_HANDLE_NEXT_BLOCK, @@ -621,16 +737,16 @@ static const struct req_format *req_formats[] = { }; struct req_msg_field { - __u32 rmf_flags; - const char *rmf_name; + const __u32 rmf_flags; + const char *rmf_name; /** * Field length. (-1) means "variable length". If the * \a RMF_F_STRUCT_ARRAY flag is set the field is also variable-length, * but the actual size must be a whole multiple of \a rmf_size. */ - int rmf_size; - void (*rmf_swabber)(void *); - void (*rmf_dumper)(void *); + const int rmf_size; + void (*rmf_swabber)(void *); + void (*rmf_dumper)(void *); int rmf_offset[ARRAY_SIZE(req_formats)][RCL_NR]; }; @@ -664,136 +780,147 @@ struct req_capsule; .rmf_dumper = (void (*)(void*))(dumper) \ } -const struct req_msg_field RMF_GENERIC_DATA = +struct req_msg_field RMF_GENERIC_DATA = DEFINE_MSGF("generic_data", 0, -1, NULL, NULL); EXPORT_SYMBOL(RMF_GENERIC_DATA); -const struct req_msg_field RMF_MGS_TARGET_INFO = +struct req_msg_field RMF_MGS_TARGET_INFO = DEFINE_MSGF("mgs_target_info", 0, sizeof(struct mgs_target_info), lustre_swab_mgs_target_info, NULL); EXPORT_SYMBOL(RMF_MGS_TARGET_INFO); -const struct req_msg_field RMF_MGS_SEND_PARAM = +struct req_msg_field RMF_MGS_SEND_PARAM = DEFINE_MSGF("mgs_send_param", 0, sizeof(struct mgs_send_param), NULL, NULL); EXPORT_SYMBOL(RMF_MGS_SEND_PARAM); -const struct req_msg_field RMF_SETINFO_VAL = +struct req_msg_field RMF_MGS_CONFIG_BODY = + DEFINE_MSGF("mgs_config_read request", 0, + sizeof(struct mgs_config_body), + lustre_swab_mgs_config_body, NULL); +EXPORT_SYMBOL(RMF_MGS_CONFIG_BODY); + +struct req_msg_field RMF_MGS_CONFIG_RES = + DEFINE_MSGF("mgs_config_read reply ", 0, + sizeof(struct mgs_config_res), + lustre_swab_mgs_config_res, NULL); +EXPORT_SYMBOL(RMF_MGS_CONFIG_RES); + +struct req_msg_field RMF_U32 = + DEFINE_MSGF("generic u32", 0, + sizeof(__u32), lustre_swab_generic_32s, NULL); +EXPORT_SYMBOL(RMF_U32); + +struct req_msg_field RMF_SETINFO_VAL = DEFINE_MSGF("setinfo_val", 0, -1, NULL, NULL); EXPORT_SYMBOL(RMF_SETINFO_VAL); -const struct req_msg_field RMF_GETINFO_KEY = +struct req_msg_field RMF_GETINFO_KEY = DEFINE_MSGF("getinfo_key", 0, -1, NULL, NULL); EXPORT_SYMBOL(RMF_GETINFO_KEY); -const struct req_msg_field RMF_GETINFO_VALLEN = +struct req_msg_field RMF_GETINFO_VALLEN = DEFINE_MSGF("getinfo_vallen", 0, sizeof(__u32), lustre_swab_generic_32s, NULL); EXPORT_SYMBOL(RMF_GETINFO_VALLEN); -const struct req_msg_field RMF_GETINFO_VAL = +struct req_msg_field RMF_GETINFO_VAL = DEFINE_MSGF("getinfo_val", 0, -1, NULL, NULL); EXPORT_SYMBOL(RMF_GETINFO_VAL); -const struct req_msg_field RMF_SEQ_OPC = +struct req_msg_field RMF_SEQ_OPC = DEFINE_MSGF("seq_query_opc", 0, sizeof(__u32), lustre_swab_generic_32s, NULL); EXPORT_SYMBOL(RMF_SEQ_OPC); -const struct req_msg_field RMF_SEQ_RANGE = +struct req_msg_field RMF_SEQ_RANGE = DEFINE_MSGF("seq_query_range", 0, sizeof(struct lu_seq_range), lustre_swab_lu_seq_range, NULL); EXPORT_SYMBOL(RMF_SEQ_RANGE); -const struct req_msg_field RMF_FLD_OPC = +struct req_msg_field RMF_FLD_OPC = DEFINE_MSGF("fld_query_opc", 0, sizeof(__u32), lustre_swab_generic_32s, NULL); EXPORT_SYMBOL(RMF_FLD_OPC); -const struct req_msg_field RMF_FLD_MDFLD = +struct req_msg_field RMF_FLD_MDFLD = DEFINE_MSGF("fld_query_mdfld", 0, sizeof(struct lu_seq_range), lustre_swab_lu_seq_range, NULL); EXPORT_SYMBOL(RMF_FLD_MDFLD); -const struct req_msg_field RMF_MDT_BODY = +struct req_msg_field RMF_MDT_BODY = DEFINE_MSGF("mdt_body", 0, sizeof(struct mdt_body), lustre_swab_mdt_body, NULL); EXPORT_SYMBOL(RMF_MDT_BODY); -const struct req_msg_field RMF_OBD_QUOTACTL = +struct req_msg_field RMF_OBD_QUOTACTL = DEFINE_MSGF("obd_quotactl", 0, sizeof(struct obd_quotactl), lustre_swab_obd_quotactl, NULL); EXPORT_SYMBOL(RMF_OBD_QUOTACTL); -const struct req_msg_field RMF_QUOTA_ADJUST_QUNIT = - DEFINE_MSGF("quota_adjust_qunit", 0, - sizeof(struct quota_adjust_qunit), - lustre_swab_quota_adjust_qunit, NULL); -EXPORT_SYMBOL(RMF_QUOTA_ADJUST_QUNIT); - -const struct req_msg_field RMF_QUNIT_DATA = - DEFINE_MSGF("qunit_data", 0, - sizeof(struct qunit_data), lustre_swab_qdata, NULL); -EXPORT_SYMBOL(RMF_QUNIT_DATA); +struct req_msg_field RMF_QUOTA_BODY = + DEFINE_MSGF("quota_body", 0, + sizeof(struct quota_body), lustre_swab_quota_body, NULL); +EXPORT_SYMBOL(RMF_QUOTA_BODY); -const struct req_msg_field RMF_MDT_EPOCH = - DEFINE_MSGF("mdt_epoch", 0, - sizeof(struct mdt_epoch), lustre_swab_mdt_epoch, NULL); +struct req_msg_field RMF_MDT_EPOCH = + DEFINE_MSGF("mdt_ioepoch", 0, + sizeof(struct mdt_ioepoch), lustre_swab_mdt_ioepoch, NULL); EXPORT_SYMBOL(RMF_MDT_EPOCH); -const struct req_msg_field RMF_PTLRPC_BODY = +struct req_msg_field RMF_PTLRPC_BODY = DEFINE_MSGF("ptlrpc_body", 0, sizeof(struct ptlrpc_body), lustre_swab_ptlrpc_body, NULL); EXPORT_SYMBOL(RMF_PTLRPC_BODY); -const struct req_msg_field RMF_OBD_STATFS = +struct req_msg_field RMF_OBD_STATFS = DEFINE_MSGF("obd_statfs", 0, sizeof(struct obd_statfs), lustre_swab_obd_statfs, NULL); EXPORT_SYMBOL(RMF_OBD_STATFS); -const struct req_msg_field RMF_SETINFO_KEY = +struct req_msg_field RMF_SETINFO_KEY = DEFINE_MSGF("setinfo_key", 0, -1, NULL, NULL); EXPORT_SYMBOL(RMF_SETINFO_KEY); -const struct req_msg_field RMF_NAME = +struct req_msg_field RMF_NAME = DEFINE_MSGF("name", RMF_F_STRING, -1, NULL, NULL); EXPORT_SYMBOL(RMF_NAME); -const struct req_msg_field RMF_SYMTGT = +struct req_msg_field RMF_SYMTGT = DEFINE_MSGF("symtgt", RMF_F_STRING, -1, NULL, NULL); EXPORT_SYMBOL(RMF_SYMTGT); -const struct req_msg_field RMF_TGTUUID = +struct req_msg_field RMF_TGTUUID = DEFINE_MSGF("tgtuuid", RMF_F_STRING, sizeof(struct obd_uuid) - 1, NULL, NULL); EXPORT_SYMBOL(RMF_TGTUUID); -const struct req_msg_field RMF_CLUUID = +struct req_msg_field RMF_CLUUID = DEFINE_MSGF("cluuid", RMF_F_STRING, sizeof(struct obd_uuid) - 1, NULL, NULL); EXPORT_SYMBOL(RMF_CLUUID); -const struct req_msg_field RMF_STRING = +struct req_msg_field RMF_STRING = DEFINE_MSGF("string", RMF_F_STRING, -1, NULL, NULL); EXPORT_SYMBOL(RMF_STRING); -const struct req_msg_field RMF_LLOGD_BODY = +struct req_msg_field RMF_LLOGD_BODY = DEFINE_MSGF("llogd_body", 0, sizeof(struct llogd_body), lustre_swab_llogd_body, NULL); EXPORT_SYMBOL(RMF_LLOGD_BODY); -const struct req_msg_field RMF_LLOG_LOG_HDR = +struct req_msg_field RMF_LLOG_LOG_HDR = DEFINE_MSGF("llog_log_hdr", 0, sizeof(struct llog_log_hdr), lustre_swab_llog_hdr, NULL); EXPORT_SYMBOL(RMF_LLOG_LOG_HDR); -const struct req_msg_field RMF_LLOGD_CONN_BODY = +struct req_msg_field RMF_LLOGD_CONN_BODY = DEFINE_MSGF("llogd_conn_body", 0, sizeof(struct llogd_conn_body), lustre_swab_llogd_conn_body, NULL); @@ -805,110 +932,195 @@ EXPORT_SYMBOL(RMF_LLOGD_CONN_BODY); * No swabbing needed because struct lustre_handle contains only a 64-bit cookie * that the client does not interpret at all. */ -const struct req_msg_field RMF_CONN = +struct req_msg_field RMF_CONN = DEFINE_MSGF("conn", 0, sizeof(struct lustre_handle), NULL, NULL); EXPORT_SYMBOL(RMF_CONN); -const struct req_msg_field RMF_CONNECT_DATA = +struct req_msg_field RMF_CONNECT_DATA = DEFINE_MSGF("cdata", RMF_F_NO_SIZE_CHECK /* we allow extra space for interop */, - sizeof(struct obd_connect_data), lustre_swab_connect, NULL); +#if LUSTRE_VERSION_CODE > OBD_OCD_VERSION(2, 7, 50, 0) + sizeof(struct obd_connect_data), +#else +/* For interoperability with 1.8 and 2.0 clients/servers. + * The RPC verification code allows larger RPC buffers, but not + * smaller buffers. Until we no longer need to keep compatibility + * with older servers/clients we can only check that the buffer + * size is at least as large as obd_connect_data_v1. That is not + * not in itself harmful, since the chance of just corrupting this + * field is low. See JIRA LU-16 for details. */ + sizeof(struct obd_connect_data_v1), +#endif + lustre_swab_connect, NULL); EXPORT_SYMBOL(RMF_CONNECT_DATA); -const struct req_msg_field RMF_DLM_REQ = +struct req_msg_field RMF_DLM_REQ = DEFINE_MSGF("dlm_req", RMF_F_NO_SIZE_CHECK /* ldlm_request_bufsize */, sizeof(struct ldlm_request), lustre_swab_ldlm_request, NULL); EXPORT_SYMBOL(RMF_DLM_REQ); -const struct req_msg_field RMF_DLM_REP = +struct req_msg_field RMF_DLM_REP = DEFINE_MSGF("dlm_rep", 0, sizeof(struct ldlm_reply), lustre_swab_ldlm_reply, NULL); EXPORT_SYMBOL(RMF_DLM_REP); -const struct req_msg_field RMF_LDLM_INTENT = +struct req_msg_field RMF_LDLM_INTENT = DEFINE_MSGF("ldlm_intent", 0, sizeof(struct ldlm_intent), lustre_swab_ldlm_intent, NULL); EXPORT_SYMBOL(RMF_LDLM_INTENT); -const struct req_msg_field RMF_DLM_LVB = - DEFINE_MSGF("dlm_lvb", 0, sizeof(struct ost_lvb), lustre_swab_ost_lvb, - NULL); +struct req_msg_field RMF_DLM_LVB = + DEFINE_MSGF("dlm_lvb", 0, -1, NULL, NULL); EXPORT_SYMBOL(RMF_DLM_LVB); -const struct req_msg_field RMF_MDT_MD = +struct req_msg_field RMF_DLM_GL_DESC = + DEFINE_MSGF("dlm_gl_desc", 0, sizeof(union ldlm_gl_desc), + lustre_swab_gl_desc, NULL); +EXPORT_SYMBOL(RMF_DLM_GL_DESC); + +struct req_msg_field RMF_MDT_MD = DEFINE_MSGF("mdt_md", RMF_F_NO_SIZE_CHECK, MIN_MD_SIZE, NULL, NULL); EXPORT_SYMBOL(RMF_MDT_MD); -const struct req_msg_field RMF_REC_REINT = +struct req_msg_field RMF_REC_REINT = DEFINE_MSGF("rec_reint", 0, sizeof(struct mdt_rec_reint), lustre_swab_mdt_rec_reint, NULL); EXPORT_SYMBOL(RMF_REC_REINT); /* FIXME: this length should be defined as a macro */ -const struct req_msg_field RMF_EADATA = DEFINE_MSGF("eadata", 0, -1, +struct req_msg_field RMF_EADATA = DEFINE_MSGF("eadata", 0, -1, NULL, NULL); EXPORT_SYMBOL(RMF_EADATA); -const struct req_msg_field RMF_ACL = +struct req_msg_field RMF_ACL = DEFINE_MSGF("acl", RMF_F_NO_SIZE_CHECK, LUSTRE_POSIX_ACL_MAX_SIZE, NULL, NULL); EXPORT_SYMBOL(RMF_ACL); /* FIXME: this should be made to use RMF_F_STRUCT_ARRAY */ -const struct req_msg_field RMF_LOGCOOKIES = +struct req_msg_field RMF_LOGCOOKIES = DEFINE_MSGF("logcookies", RMF_F_NO_SIZE_CHECK /* multiple cookies */, sizeof(struct llog_cookie), NULL, NULL); EXPORT_SYMBOL(RMF_LOGCOOKIES); -const struct req_msg_field RMF_CAPA1 = +struct req_msg_field RMF_CAPA1 = DEFINE_MSGF("capa", 0, sizeof(struct lustre_capa), lustre_swab_lustre_capa, NULL); EXPORT_SYMBOL(RMF_CAPA1); -const struct req_msg_field RMF_CAPA2 = +struct req_msg_field RMF_CAPA2 = DEFINE_MSGF("capa", 0, sizeof(struct lustre_capa), lustre_swab_lustre_capa, NULL); EXPORT_SYMBOL(RMF_CAPA2); +struct req_msg_field RMF_LAYOUT_INTENT = + DEFINE_MSGF("layout_intent", 0, + sizeof(struct layout_intent), lustre_swab_layout_intent, + NULL); +EXPORT_SYMBOL(RMF_LAYOUT_INTENT); + /* * OST request field. */ -const struct req_msg_field RMF_OST_BODY = +struct req_msg_field RMF_OST_BODY = DEFINE_MSGF("ost_body", 0, sizeof(struct ost_body), lustre_swab_ost_body, dump_ost_body); EXPORT_SYMBOL(RMF_OST_BODY); -const struct req_msg_field RMF_OBD_IOOBJ = +struct req_msg_field RMF_OBD_IOOBJ = DEFINE_MSGF("obd_ioobj", RMF_F_STRUCT_ARRAY, sizeof(struct obd_ioobj), lustre_swab_obd_ioobj, dump_ioo); EXPORT_SYMBOL(RMF_OBD_IOOBJ); -const struct req_msg_field RMF_NIOBUF_REMOTE = +struct req_msg_field RMF_NIOBUF_REMOTE = DEFINE_MSGF("niobuf_remote", RMF_F_STRUCT_ARRAY, sizeof(struct niobuf_remote), lustre_swab_niobuf_remote, dump_rniobuf); EXPORT_SYMBOL(RMF_NIOBUF_REMOTE); -const struct req_msg_field RMF_RCS = +struct req_msg_field RMF_RCS = DEFINE_MSGF("niobuf_remote", RMF_F_STRUCT_ARRAY, sizeof(__u32), lustre_swab_generic_32s, dump_rcs); EXPORT_SYMBOL(RMF_RCS); -const struct req_msg_field RMF_OBD_ID = +struct req_msg_field RMF_OBD_ID = DEFINE_MSGF("obd_id", 0, sizeof(obd_id), lustre_swab_ost_last_id, NULL); EXPORT_SYMBOL(RMF_OBD_ID); -const struct req_msg_field RMF_FIEMAP_KEY = +struct req_msg_field RMF_FID = + DEFINE_MSGF("fid", 0, + sizeof(struct lu_fid), lustre_swab_lu_fid, NULL); +EXPORT_SYMBOL(RMF_FID); + +struct req_msg_field RMF_OST_ID = + DEFINE_MSGF("ost_id", 0, + sizeof(struct ost_id), lustre_swab_ost_id, NULL); +EXPORT_SYMBOL(RMF_OST_ID); + +struct req_msg_field RMF_FIEMAP_KEY = DEFINE_MSGF("fiemap", 0, sizeof(struct ll_fiemap_info_key), lustre_swab_fiemap, NULL); EXPORT_SYMBOL(RMF_FIEMAP_KEY); -const struct req_msg_field RMF_FIEMAP_VAL = +struct req_msg_field RMF_FIEMAP_VAL = DEFINE_MSGF("fiemap", 0, -1, lustre_swab_fiemap, NULL); EXPORT_SYMBOL(RMF_FIEMAP_VAL); +struct req_msg_field RMF_IDX_INFO = + DEFINE_MSGF("idx_info", 0, sizeof(struct idx_info), + lustre_swab_idx_info, NULL); +EXPORT_SYMBOL(RMF_IDX_INFO); +struct req_msg_field RMF_HSM_USER_STATE = + DEFINE_MSGF("hsm_user_state", 0, sizeof(struct hsm_user_state), + lustre_swab_hsm_user_state, NULL); +EXPORT_SYMBOL(RMF_HSM_USER_STATE); + +struct req_msg_field RMF_HSM_STATE_SET = + DEFINE_MSGF("hsm_state_set", 0, sizeof(struct hsm_state_set), + lustre_swab_hsm_state_set, NULL); +EXPORT_SYMBOL(RMF_HSM_STATE_SET); + +struct req_msg_field RMF_MDS_HSM_PROGRESS = + DEFINE_MSGF("hsm_progress", 0, sizeof(struct hsm_progress_kernel), + lustre_swab_hsm_progress_kernel, NULL); +EXPORT_SYMBOL(RMF_MDS_HSM_PROGRESS); + +struct req_msg_field RMF_MDS_HSM_CURRENT_ACTION = + DEFINE_MSGF("hsm_current_action", 0, sizeof(struct hsm_current_action), + lustre_swab_hsm_current_action, NULL); +EXPORT_SYMBOL(RMF_MDS_HSM_CURRENT_ACTION); + +struct req_msg_field RMF_MDS_HSM_USER_ITEM = + DEFINE_MSGF("hsm_user_item", RMF_F_STRUCT_ARRAY, + sizeof(struct hsm_user_item), lustre_swab_hsm_user_item, + NULL); +EXPORT_SYMBOL(RMF_MDS_HSM_USER_ITEM); + +struct req_msg_field RMF_MDS_HSM_ARCHIVE = + DEFINE_MSGF("hsm_archive", 0, + sizeof(__u32), lustre_swab_generic_32s, NULL); +EXPORT_SYMBOL(RMF_MDS_HSM_ARCHIVE); + +struct req_msg_field RMF_MDS_HSM_REQUEST = + DEFINE_MSGF("hsm_request", 0, sizeof(struct hsm_request), + lustre_swab_hsm_request, NULL); +EXPORT_SYMBOL(RMF_MDS_HSM_REQUEST); + +struct req_msg_field RMF_UPDATE = DEFINE_MSGF("update", 0, -1, + lustre_swab_update_buf, NULL); +EXPORT_SYMBOL(RMF_UPDATE); + +struct req_msg_field RMF_UPDATE_REPLY = DEFINE_MSGF("update_reply", 0, -1, + lustre_swab_update_reply_buf, + NULL); +EXPORT_SYMBOL(RMF_UPDATE_REPLY); + +struct req_msg_field RMF_SWAP_LAYOUTS = + DEFINE_MSGF("swap_layouts", 0, sizeof(struct mdc_swap_layouts), + lustre_swab_swap_layouts, NULL); +EXPORT_SYMBOL(RMF_SWAP_LAYOUTS); /* * Request formats. */ @@ -939,355 +1151,429 @@ struct req_format { #define DEFINE_REQ_FMT0(name, client, server) \ DEFINE_REQ_FMT(name, client, ARRAY_SIZE(client), server, ARRAY_SIZE(server)) -const struct req_format RQF_OBD_PING = +struct req_format RQF_OBD_PING = DEFINE_REQ_FMT0("OBD_PING", empty, empty); EXPORT_SYMBOL(RQF_OBD_PING); -const struct req_format RQF_OBD_SET_INFO = +struct req_format RQF_OBD_SET_INFO = DEFINE_REQ_FMT0("OBD_SET_INFO", obd_set_info_client, empty); EXPORT_SYMBOL(RQF_OBD_SET_INFO); -const struct req_format RQF_SEC_CTX = +/* Read index file through the network */ +struct req_format RQF_OBD_IDX_READ = + DEFINE_REQ_FMT0("OBD_IDX_READ", + obd_idx_read_client, obd_idx_read_server); +EXPORT_SYMBOL(RQF_OBD_IDX_READ); + +struct req_format RQF_SEC_CTX = DEFINE_REQ_FMT0("SEC_CTX", empty, empty); EXPORT_SYMBOL(RQF_SEC_CTX); -const struct req_format RQF_MGS_TARGET_REG = +struct req_format RQF_MGS_TARGET_REG = DEFINE_REQ_FMT0("MGS_TARGET_REG", mgs_target_info_only, mgs_target_info_only); EXPORT_SYMBOL(RQF_MGS_TARGET_REG); -const struct req_format RQF_MGS_SET_INFO = +struct req_format RQF_MGS_SET_INFO = DEFINE_REQ_FMT0("MGS_SET_INFO", mgs_set_info, mgs_set_info); EXPORT_SYMBOL(RQF_MGS_SET_INFO); -const struct req_format RQF_SEQ_QUERY = +struct req_format RQF_MGS_CONFIG_READ = + DEFINE_REQ_FMT0("MGS_CONFIG_READ", mgs_config_read_client, + mgs_config_read_server); +EXPORT_SYMBOL(RQF_MGS_CONFIG_READ); + +struct req_format RQF_SEQ_QUERY = DEFINE_REQ_FMT0("SEQ_QUERY", seq_query_client, seq_query_server); EXPORT_SYMBOL(RQF_SEQ_QUERY); -const struct req_format RQF_FLD_QUERY = +struct req_format RQF_FLD_QUERY = DEFINE_REQ_FMT0("FLD_QUERY", fld_query_client, fld_query_server); EXPORT_SYMBOL(RQF_FLD_QUERY); -const struct req_format RQF_LOG_CANCEL = +struct req_format RQF_LOG_CANCEL = DEFINE_REQ_FMT0("OBD_LOG_CANCEL", log_cancel_client, empty); EXPORT_SYMBOL(RQF_LOG_CANCEL); -const struct req_format RQF_MDS_QUOTACHECK = +struct req_format RQF_MDS_QUOTACHECK = DEFINE_REQ_FMT0("MDS_QUOTACHECK", quotactl_only, empty); EXPORT_SYMBOL(RQF_MDS_QUOTACHECK); -const struct req_format RQF_OST_QUOTACHECK = +struct req_format RQF_OST_QUOTACHECK = DEFINE_REQ_FMT0("OST_QUOTACHECK", quotactl_only, empty); EXPORT_SYMBOL(RQF_OST_QUOTACHECK); -const struct req_format RQF_MDS_QUOTACTL = +struct req_format RQF_MDS_QUOTACTL = DEFINE_REQ_FMT0("MDS_QUOTACTL", quotactl_only, quotactl_only); EXPORT_SYMBOL(RQF_MDS_QUOTACTL); -const struct req_format RQF_OST_QUOTACTL = +struct req_format RQF_OST_QUOTACTL = DEFINE_REQ_FMT0("OST_QUOTACTL", quotactl_only, quotactl_only); EXPORT_SYMBOL(RQF_OST_QUOTACTL); -const struct req_format RQF_OST_QUOTA_ADJUST_QUNIT = - DEFINE_REQ_FMT0("OST_QUOTA_ADJUST_QUNIT", quota_adjust_qunit_only, - quota_adjust_qunit_only); -EXPORT_SYMBOL(RQF_OST_QUOTA_ADJUST_QUNIT); - -const struct req_format RQF_QC_CALLBACK = +struct req_format RQF_QC_CALLBACK = DEFINE_REQ_FMT0("QC_CALLBACK", quotactl_only, empty); EXPORT_SYMBOL(RQF_QC_CALLBACK); -const struct req_format RQF_MDS_QUOTA_DQACQ = - DEFINE_REQ_FMT0("MDS_QUOTA_DQACQ", qunit_data_only, qunit_data_only); -EXPORT_SYMBOL(RQF_MDS_QUOTA_DQACQ); +struct req_format RQF_QUOTA_DQACQ = + DEFINE_REQ_FMT0("QUOTA_DQACQ", quota_body_only, quota_body_only); +EXPORT_SYMBOL(RQF_QUOTA_DQACQ); -const struct req_format RQF_MDS_GETSTATUS = +struct req_format RQF_LDLM_INTENT_QUOTA = + DEFINE_REQ_FMT0("LDLM_INTENT_QUOTA", + ldlm_intent_quota_client, + ldlm_intent_quota_server); +EXPORT_SYMBOL(RQF_LDLM_INTENT_QUOTA); + +struct req_format RQF_MDS_GETSTATUS = DEFINE_REQ_FMT0("MDS_GETSTATUS", mdt_body_only, mdt_body_capa); EXPORT_SYMBOL(RQF_MDS_GETSTATUS); -const struct req_format RQF_MDS_STATFS = +struct req_format RQF_MDS_STATFS = DEFINE_REQ_FMT0("MDS_STATFS", empty, obd_statfs_server); EXPORT_SYMBOL(RQF_MDS_STATFS); -const struct req_format RQF_MDS_SYNC = +struct req_format RQF_MDS_SYNC = DEFINE_REQ_FMT0("MDS_SYNC", mdt_body_capa, mdt_body_only); EXPORT_SYMBOL(RQF_MDS_SYNC); -const struct req_format RQF_MDS_GETATTR = +struct req_format RQF_MDS_GETATTR = DEFINE_REQ_FMT0("MDS_GETATTR", mdt_body_capa, mds_getattr_server); EXPORT_SYMBOL(RQF_MDS_GETATTR); -const struct req_format RQF_MDS_GETXATTR = +struct req_format RQF_MDS_GETXATTR = DEFINE_REQ_FMT0("MDS_GETXATTR", mds_getxattr_client, mds_getxattr_server); EXPORT_SYMBOL(RQF_MDS_GETXATTR); -const struct req_format RQF_MDS_GETATTR_NAME = +struct req_format RQF_MDS_GETATTR_NAME = DEFINE_REQ_FMT0("MDS_GETATTR_NAME", mds_getattr_name_client, mds_getattr_server); EXPORT_SYMBOL(RQF_MDS_GETATTR_NAME); -const struct req_format RQF_MDS_REINT = +struct req_format RQF_MDS_REINT = DEFINE_REQ_FMT0("MDS_REINT", mds_reint_client, mdt_body_only); EXPORT_SYMBOL(RQF_MDS_REINT); -const struct req_format RQF_MDS_REINT_CREATE = +struct req_format RQF_MDS_REINT_CREATE = DEFINE_REQ_FMT0("MDS_REINT_CREATE", mds_reint_create_client, mdt_body_capa); EXPORT_SYMBOL(RQF_MDS_REINT_CREATE); -const struct req_format RQF_MDS_REINT_CREATE_RMT_ACL = +struct req_format RQF_MDS_REINT_CREATE_RMT_ACL = DEFINE_REQ_FMT0("MDS_REINT_CREATE_RMT_ACL", mds_reint_create_rmt_acl_client, mdt_body_capa); EXPORT_SYMBOL(RQF_MDS_REINT_CREATE_RMT_ACL); -const struct req_format RQF_MDS_REINT_CREATE_SLAVE = +struct req_format RQF_MDS_REINT_CREATE_SLAVE = DEFINE_REQ_FMT0("MDS_REINT_CREATE_EA", mds_reint_create_slave_client, mdt_body_capa); EXPORT_SYMBOL(RQF_MDS_REINT_CREATE_SLAVE); -const struct req_format RQF_MDS_REINT_CREATE_SYM = +struct req_format RQF_MDS_REINT_CREATE_SYM = DEFINE_REQ_FMT0("MDS_REINT_CREATE_SYM", mds_reint_create_sym_client, mdt_body_capa); EXPORT_SYMBOL(RQF_MDS_REINT_CREATE_SYM); -const struct req_format RQF_MDS_REINT_OPEN = +struct req_format RQF_MDS_REINT_OPEN = DEFINE_REQ_FMT0("MDS_REINT_OPEN", mds_reint_open_client, mds_reint_open_server); EXPORT_SYMBOL(RQF_MDS_REINT_OPEN); -const struct req_format RQF_MDS_REINT_UNLINK = +struct req_format RQF_MDS_REINT_UNLINK = DEFINE_REQ_FMT0("MDS_REINT_UNLINK", mds_reint_unlink_client, mds_last_unlink_server); EXPORT_SYMBOL(RQF_MDS_REINT_UNLINK); -const struct req_format RQF_MDS_REINT_LINK = +struct req_format RQF_MDS_REINT_LINK = DEFINE_REQ_FMT0("MDS_REINT_LINK", mds_reint_link_client, mdt_body_only); EXPORT_SYMBOL(RQF_MDS_REINT_LINK); -const struct req_format RQF_MDS_REINT_RENAME = +struct req_format RQF_MDS_REINT_RENAME = DEFINE_REQ_FMT0("MDS_REINT_RENAME", mds_reint_rename_client, mds_last_unlink_server); EXPORT_SYMBOL(RQF_MDS_REINT_RENAME); -const struct req_format RQF_MDS_REINT_SETATTR = +struct req_format RQF_MDS_REINT_SETATTR = DEFINE_REQ_FMT0("MDS_REINT_SETATTR", mds_reint_setattr_client, mds_setattr_server); EXPORT_SYMBOL(RQF_MDS_REINT_SETATTR); -const struct req_format RQF_MDS_REINT_SETXATTR = +struct req_format RQF_MDS_REINT_SETXATTR = DEFINE_REQ_FMT0("MDS_REINT_SETXATTR", mds_reint_setxattr_client, mdt_body_only); EXPORT_SYMBOL(RQF_MDS_REINT_SETXATTR); -const struct req_format RQF_MDS_CONNECT = +struct req_format RQF_MDS_CONNECT = DEFINE_REQ_FMT0("MDS_CONNECT", obd_connect_client, obd_connect_server); EXPORT_SYMBOL(RQF_MDS_CONNECT); -const struct req_format RQF_MDS_DISCONNECT = +struct req_format RQF_MDS_DISCONNECT = DEFINE_REQ_FMT0("MDS_DISCONNECT", empty, empty); EXPORT_SYMBOL(RQF_MDS_DISCONNECT); -const struct req_format RQF_MDS_GET_INFO = +struct req_format RQF_MDS_GET_INFO = DEFINE_REQ_FMT0("MDS_GET_INFO", mds_getinfo_client, mds_getinfo_server); EXPORT_SYMBOL(RQF_MDS_GET_INFO); -const struct req_format RQF_LDLM_ENQUEUE = +struct req_format RQF_UPDATE_OBJ = + DEFINE_REQ_FMT0("OBJECT_UPDATE_OBJ", mds_update_client, + mds_update_server); +EXPORT_SYMBOL(RQF_UPDATE_OBJ); + +struct req_format RQF_LDLM_ENQUEUE = DEFINE_REQ_FMT0("LDLM_ENQUEUE", ldlm_enqueue_client, ldlm_enqueue_lvb_server); EXPORT_SYMBOL(RQF_LDLM_ENQUEUE); -const struct req_format RQF_LDLM_ENQUEUE_LVB = +struct req_format RQF_LDLM_ENQUEUE_LVB = DEFINE_REQ_FMT0("LDLM_ENQUEUE_LVB", ldlm_enqueue_client, ldlm_enqueue_lvb_server); EXPORT_SYMBOL(RQF_LDLM_ENQUEUE_LVB); -const struct req_format RQF_LDLM_CONVERT = +struct req_format RQF_LDLM_CONVERT = DEFINE_REQ_FMT0("LDLM_CONVERT", ldlm_enqueue_client, ldlm_enqueue_server); EXPORT_SYMBOL(RQF_LDLM_CONVERT); -const struct req_format RQF_LDLM_CANCEL = +struct req_format RQF_LDLM_CANCEL = DEFINE_REQ_FMT0("LDLM_CANCEL", ldlm_enqueue_client, empty); EXPORT_SYMBOL(RQF_LDLM_CANCEL); -const struct req_format RQF_LDLM_CALLBACK = +struct req_format RQF_LDLM_CALLBACK = DEFINE_REQ_FMT0("LDLM_CALLBACK", ldlm_enqueue_client, empty); EXPORT_SYMBOL(RQF_LDLM_CALLBACK); -const struct req_format RQF_LDLM_CP_CALLBACK = +struct req_format RQF_LDLM_CP_CALLBACK = DEFINE_REQ_FMT0("LDLM_CP_CALLBACK", ldlm_cp_callback_client, empty); EXPORT_SYMBOL(RQF_LDLM_CP_CALLBACK); -const struct req_format RQF_LDLM_BL_CALLBACK = +struct req_format RQF_LDLM_BL_CALLBACK = DEFINE_REQ_FMT0("LDLM_BL_CALLBACK", ldlm_enqueue_client, empty); EXPORT_SYMBOL(RQF_LDLM_BL_CALLBACK); -const struct req_format RQF_LDLM_GL_CALLBACK = +struct req_format RQF_LDLM_GL_CALLBACK = DEFINE_REQ_FMT0("LDLM_GL_CALLBACK", ldlm_enqueue_client, ldlm_gl_callback_server); EXPORT_SYMBOL(RQF_LDLM_GL_CALLBACK); -const struct req_format RQF_LDLM_INTENT = +struct req_format RQF_LDLM_GL_DESC_CALLBACK = + DEFINE_REQ_FMT0("LDLM_GL_CALLBACK", ldlm_gl_callback_desc_client, + ldlm_gl_callback_server); +EXPORT_SYMBOL(RQF_LDLM_GL_DESC_CALLBACK); + +struct req_format RQF_LDLM_INTENT_BASIC = + DEFINE_REQ_FMT0("LDLM_INTENT_BASIC", + ldlm_intent_basic_client, ldlm_enqueue_lvb_server); +EXPORT_SYMBOL(RQF_LDLM_INTENT_BASIC); + +struct req_format RQF_LDLM_INTENT = DEFINE_REQ_FMT0("LDLM_INTENT", ldlm_intent_client, ldlm_intent_server); EXPORT_SYMBOL(RQF_LDLM_INTENT); -const struct req_format RQF_LDLM_INTENT_GETATTR = +struct req_format RQF_LDLM_INTENT_LAYOUT = + DEFINE_REQ_FMT0("LDLM_INTENT_LAYOUT ", + ldlm_intent_layout_client, ldlm_enqueue_lvb_server); +EXPORT_SYMBOL(RQF_LDLM_INTENT_LAYOUT); + +struct req_format RQF_LDLM_INTENT_GETATTR = DEFINE_REQ_FMT0("LDLM_INTENT_GETATTR", ldlm_intent_getattr_client, ldlm_intent_getattr_server); EXPORT_SYMBOL(RQF_LDLM_INTENT_GETATTR); -const struct req_format RQF_LDLM_INTENT_OPEN = +struct req_format RQF_LDLM_INTENT_OPEN = DEFINE_REQ_FMT0("LDLM_INTENT_OPEN", ldlm_intent_open_client, ldlm_intent_open_server); EXPORT_SYMBOL(RQF_LDLM_INTENT_OPEN); -const struct req_format RQF_LDLM_INTENT_CREATE = +struct req_format RQF_LDLM_INTENT_CREATE = DEFINE_REQ_FMT0("LDLM_INTENT_CREATE", ldlm_intent_create_client, ldlm_intent_getattr_server); EXPORT_SYMBOL(RQF_LDLM_INTENT_CREATE); -const struct req_format RQF_LDLM_INTENT_UNLINK = +struct req_format RQF_LDLM_INTENT_UNLINK = DEFINE_REQ_FMT0("LDLM_INTENT_UNLINK", ldlm_intent_unlink_client, ldlm_intent_server); EXPORT_SYMBOL(RQF_LDLM_INTENT_UNLINK); -const struct req_format RQF_MDS_CLOSE = +struct req_format RQF_MDS_CLOSE = DEFINE_REQ_FMT0("MDS_CLOSE", mdt_close_client, mds_last_unlink_server); EXPORT_SYMBOL(RQF_MDS_CLOSE); -const struct req_format RQF_MDS_PIN = +struct req_format RQF_MDS_PIN = DEFINE_REQ_FMT0("MDS_PIN", mdt_body_capa, mdt_body_only); EXPORT_SYMBOL(RQF_MDS_PIN); -const struct req_format RQF_MDS_UNPIN = +struct req_format RQF_MDS_UNPIN = DEFINE_REQ_FMT0("MDS_UNPIN", mdt_body_only, empty); EXPORT_SYMBOL(RQF_MDS_UNPIN); -const struct req_format RQF_MDS_DONE_WRITING = +struct req_format RQF_MDS_DONE_WRITING = DEFINE_REQ_FMT0("MDS_DONE_WRITING", mdt_close_client, mdt_body_only); EXPORT_SYMBOL(RQF_MDS_DONE_WRITING); -const struct req_format RQF_MDS_READPAGE = +struct req_format RQF_MDS_READPAGE = DEFINE_REQ_FMT0("MDS_READPAGE", mdt_body_capa, mdt_body_only); EXPORT_SYMBOL(RQF_MDS_READPAGE); +struct req_format RQF_MDS_HSM_ACTION = + DEFINE_REQ_FMT0("MDS_HSM_ACTION", mdt_body_capa, mdt_hsm_action_server); +EXPORT_SYMBOL(RQF_MDS_HSM_ACTION); + +struct req_format RQF_MDS_HSM_PROGRESS = + DEFINE_REQ_FMT0("MDS_HSM_PROGRESS", mdt_hsm_progress, empty); +EXPORT_SYMBOL(RQF_MDS_HSM_PROGRESS); + +struct req_format RQF_MDS_HSM_CT_REGISTER = + DEFINE_REQ_FMT0("MDS_HSM_CT_REGISTER", mdt_hsm_ct_register, empty); +EXPORT_SYMBOL(RQF_MDS_HSM_CT_REGISTER); + +struct req_format RQF_MDS_HSM_CT_UNREGISTER = + DEFINE_REQ_FMT0("MDS_HSM_CT_UNREGISTER", empty, empty); +EXPORT_SYMBOL(RQF_MDS_HSM_CT_UNREGISTER); + +struct req_format RQF_MDS_HSM_STATE_GET = + DEFINE_REQ_FMT0("MDS_HSM_STATE_GET", + mdt_body_capa, mdt_hsm_state_get_server); +EXPORT_SYMBOL(RQF_MDS_HSM_STATE_GET); + +struct req_format RQF_MDS_HSM_STATE_SET = + DEFINE_REQ_FMT0("MDS_HSM_STATE_SET", mdt_hsm_state_set, empty); +EXPORT_SYMBOL(RQF_MDS_HSM_STATE_SET); + +struct req_format RQF_MDS_HSM_REQUEST = + DEFINE_REQ_FMT0("MDS_HSM_REQUEST", mdt_hsm_request, empty); +EXPORT_SYMBOL(RQF_MDS_HSM_REQUEST); + +struct req_format RQF_MDS_SWAP_LAYOUTS = + DEFINE_REQ_FMT0("MDS_SWAP_LAYOUTS", + mdt_swap_layouts, empty); +EXPORT_SYMBOL(RQF_MDS_SWAP_LAYOUTS); + /* This is for split */ -const struct req_format RQF_MDS_WRITEPAGE = +struct req_format RQF_MDS_WRITEPAGE = DEFINE_REQ_FMT0("MDS_WRITEPAGE", mdt_body_capa, mdt_body_only); EXPORT_SYMBOL(RQF_MDS_WRITEPAGE); -const struct req_format RQF_MDS_IS_SUBDIR = +struct req_format RQF_MDS_IS_SUBDIR = DEFINE_REQ_FMT0("MDS_IS_SUBDIR", mdt_body_only, mdt_body_only); EXPORT_SYMBOL(RQF_MDS_IS_SUBDIR); -const struct req_format RQF_LLOG_CATINFO = - DEFINE_REQ_FMT0("LLOG_CATINFO", - llog_catinfo_client, llog_catinfo_server); -EXPORT_SYMBOL(RQF_LLOG_CATINFO); - -const struct req_format RQF_LLOG_ORIGIN_HANDLE_CREATE = +struct req_format RQF_LLOG_ORIGIN_HANDLE_CREATE = DEFINE_REQ_FMT0("LLOG_ORIGIN_HANDLE_CREATE", llog_origin_handle_create_client, llogd_body_only); EXPORT_SYMBOL(RQF_LLOG_ORIGIN_HANDLE_CREATE); -const struct req_format RQF_LLOG_ORIGIN_HANDLE_DESTROY = +struct req_format RQF_LLOG_ORIGIN_HANDLE_DESTROY = DEFINE_REQ_FMT0("LLOG_ORIGIN_HANDLE_DESTROY", llogd_body_only, llogd_body_only); EXPORT_SYMBOL(RQF_LLOG_ORIGIN_HANDLE_DESTROY); -const struct req_format RQF_LLOG_ORIGIN_HANDLE_NEXT_BLOCK = +struct req_format RQF_LLOG_ORIGIN_HANDLE_NEXT_BLOCK = DEFINE_REQ_FMT0("LLOG_ORIGIN_HANDLE_NEXT_BLOCK", llogd_body_only, llog_origin_handle_next_block_server); EXPORT_SYMBOL(RQF_LLOG_ORIGIN_HANDLE_NEXT_BLOCK); -const struct req_format RQF_LLOG_ORIGIN_HANDLE_PREV_BLOCK = +struct req_format RQF_LLOG_ORIGIN_HANDLE_PREV_BLOCK = DEFINE_REQ_FMT0("LLOG_ORIGIN_HANDLE_PREV_BLOCK", llogd_body_only, llog_origin_handle_next_block_server); EXPORT_SYMBOL(RQF_LLOG_ORIGIN_HANDLE_PREV_BLOCK); -const struct req_format RQF_LLOG_ORIGIN_HANDLE_READ_HEADER = +struct req_format RQF_LLOG_ORIGIN_HANDLE_READ_HEADER = DEFINE_REQ_FMT0("LLOG_ORIGIN_HANDLE_READ_HEADER", llogd_body_only, llog_log_hdr_only); EXPORT_SYMBOL(RQF_LLOG_ORIGIN_HANDLE_READ_HEADER); -const struct req_format RQF_LLOG_ORIGIN_CONNECT = +struct req_format RQF_LLOG_ORIGIN_CONNECT = DEFINE_REQ_FMT0("LLOG_ORIGIN_CONNECT", llogd_conn_body_only, empty); EXPORT_SYMBOL(RQF_LLOG_ORIGIN_CONNECT); -const struct req_format RQF_OST_CONNECT = +struct req_format RQF_OST_CONNECT = DEFINE_REQ_FMT0("OST_CONNECT", obd_connect_client, obd_connect_server); EXPORT_SYMBOL(RQF_OST_CONNECT); -const struct req_format RQF_OST_DISCONNECT = +struct req_format RQF_OST_DISCONNECT = DEFINE_REQ_FMT0("OST_DISCONNECT", empty, empty); EXPORT_SYMBOL(RQF_OST_DISCONNECT); -const struct req_format RQF_OST_GETATTR = +struct req_format RQF_OST_GETATTR = DEFINE_REQ_FMT0("OST_GETATTR", ost_body_capa, ost_body_only); EXPORT_SYMBOL(RQF_OST_GETATTR); -const struct req_format RQF_OST_SETATTR = +struct req_format RQF_OST_SETATTR = DEFINE_REQ_FMT0("OST_SETATTR", ost_body_capa, ost_body_only); EXPORT_SYMBOL(RQF_OST_SETATTR); -const struct req_format RQF_OST_CREATE = +struct req_format RQF_OST_CREATE = DEFINE_REQ_FMT0("OST_CREATE", ost_body_only, ost_body_only); EXPORT_SYMBOL(RQF_OST_CREATE); -const struct req_format RQF_OST_PUNCH = +struct req_format RQF_OST_PUNCH = DEFINE_REQ_FMT0("OST_PUNCH", ost_body_capa, ost_body_only); EXPORT_SYMBOL(RQF_OST_PUNCH); -const struct req_format RQF_OST_SYNC = +struct req_format RQF_OST_SYNC = DEFINE_REQ_FMT0("OST_SYNC", ost_body_capa, ost_body_only); EXPORT_SYMBOL(RQF_OST_SYNC); -const struct req_format RQF_OST_DESTROY = +struct req_format RQF_OST_DESTROY = DEFINE_REQ_FMT0("OST_DESTROY", ost_destroy_client, ost_body_only); EXPORT_SYMBOL(RQF_OST_DESTROY); -const struct req_format RQF_OST_BRW = - DEFINE_REQ_FMT0("OST_BRW", ost_brw_client, ost_brw_server); -EXPORT_SYMBOL(RQF_OST_BRW); +struct req_format RQF_OST_BRW_READ = + DEFINE_REQ_FMT0("OST_BRW_READ", ost_brw_client, ost_brw_read_server); +EXPORT_SYMBOL(RQF_OST_BRW_READ); -const struct req_format RQF_OST_STATFS = +struct req_format RQF_OST_BRW_WRITE = + DEFINE_REQ_FMT0("OST_BRW_WRITE", ost_brw_client, ost_brw_write_server); +EXPORT_SYMBOL(RQF_OST_BRW_WRITE); + +struct req_format RQF_OST_STATFS = DEFINE_REQ_FMT0("OST_STATFS", empty, obd_statfs_server); EXPORT_SYMBOL(RQF_OST_STATFS); -const struct req_format RQF_OST_SET_GRANT_INFO = +struct req_format RQF_OST_SET_GRANT_INFO = DEFINE_REQ_FMT0("OST_SET_GRANT_INFO", ost_grant_shrink_client, ost_body_only); EXPORT_SYMBOL(RQF_OST_SET_GRANT_INFO); -const struct req_format RQF_OST_GET_INFO_GENERIC = +struct req_format RQF_OST_GET_INFO_GENERIC = DEFINE_REQ_FMT0("OST_GET_INFO", ost_get_info_generic_client, ost_get_info_generic_server); EXPORT_SYMBOL(RQF_OST_GET_INFO_GENERIC); -const struct req_format RQF_OST_GET_INFO_LAST_ID = +struct req_format RQF_OST_GET_INFO_LAST_ID = DEFINE_REQ_FMT0("OST_GET_INFO_LAST_ID", ost_get_info_generic_client, ost_get_last_id_server); EXPORT_SYMBOL(RQF_OST_GET_INFO_LAST_ID); -const struct req_format RQF_OST_GET_INFO_FIEMAP = +struct req_format RQF_OST_GET_INFO_LAST_FID = + DEFINE_REQ_FMT0("OST_GET_INFO_LAST_FID", obd_set_info_client, + ost_get_last_fid_server); +EXPORT_SYMBOL(RQF_OST_GET_INFO_LAST_FID); + +struct req_format RQF_OST_SET_INFO_LAST_FID = + DEFINE_REQ_FMT0("OST_SET_INFO_LAST_FID", obd_set_info_client, + empty); +EXPORT_SYMBOL(RQF_OST_SET_INFO_LAST_FID); + +struct req_format RQF_OST_GET_INFO_FIEMAP = DEFINE_REQ_FMT0("OST_GET_INFO_FIEMAP", ost_get_fiemap_client, ost_get_fiemap_server); EXPORT_SYMBOL(RQF_OST_GET_INFO_FIEMAP); - #if !defined(__REQ_LAYOUT_USER__) /* Convenience macro */ @@ -1305,7 +1591,7 @@ int req_layout_init(void) struct req_format *rf = NULL; for (i = 0; i < ARRAY_SIZE(req_formats); ++i) { - rf = (struct req_format *)req_formats[i]; + rf = req_formats[i]; rf->rf_idx = i; for (j = 0; j < RCL_NR; ++j) { LASSERT(rf->rf_fields[j].nr <= REQ_MAX_FIELD_NR); @@ -1724,8 +2010,8 @@ EXPORT_SYMBOL(req_capsule_client_get); * unused too. */ void *req_capsule_client_swab_get(struct req_capsule *pill, - const struct req_msg_field *field, - void (*swabber)(void* )) + const struct req_msg_field *field, + void *swabber) { return __req_capsule_get(pill, field, RCL_CLIENT, swabber, 0); } @@ -1788,6 +2074,15 @@ void *req_capsule_server_sized_get(struct req_capsule *pill, } EXPORT_SYMBOL(req_capsule_server_sized_get); +void *req_capsule_server_sized_swab_get(struct req_capsule *pill, + const struct req_msg_field *field, + int len, void *swabber) +{ + req_capsule_set_size(pill, field, RCL_SERVER, len); + return __req_capsule_get(pill, field, RCL_SERVER, swabber, 0); +} +EXPORT_SYMBOL(req_capsule_server_sized_swab_get); + /** * Returns the buffer of a \a pill corresponding to the given \a field from the * request (if the caller is executing on the server-side) or reply (if the @@ -1897,7 +2192,8 @@ int req_capsule_fmt_size(__u32 magic, const struct req_format *fmt, for (; i < fmt->rf_fields[loc].nr; ++i) if (fmt->rf_fields[loc].d[i]->rmf_size != -1) - size += size_round(fmt->rf_fields[loc].d[i]->rmf_size); + size += cfs_size_round(fmt->rf_fields[loc].d[i]-> + rmf_size); return size; } @@ -2029,5 +2325,67 @@ void req_capsule_shrink(struct req_capsule *pill, } EXPORT_SYMBOL(req_capsule_shrink); +int req_capsule_server_grow(struct req_capsule *pill, + const struct req_msg_field *field, + unsigned int newlen) +{ + struct ptlrpc_reply_state *rs = pill->rc_req->rq_reply_state, *nrs; + char *from, *to; + int offset, len, rc; + + LASSERT(pill->rc_fmt != NULL); + LASSERT(__req_format_is_sane(pill->rc_fmt)); + LASSERT(req_capsule_has_field(pill, field, RCL_SERVER)); + LASSERT(req_capsule_field_present(pill, field, RCL_SERVER)); + + len = req_capsule_get_size(pill, field, RCL_SERVER); + offset = __req_capsule_offset(pill, field, RCL_SERVER); + if (pill->rc_req->rq_repbuf_len >= + lustre_packed_msg_size(pill->rc_req->rq_repmsg) - len + newlen) + CERROR("Inplace repack might be done\n"); + + pill->rc_req->rq_reply_state = NULL; + req_capsule_set_size(pill, field, RCL_SERVER, newlen); + rc = req_capsule_server_pack(pill); + if (rc) { + /* put old rs back, the caller will decide what to do */ + pill->rc_req->rq_reply_state = rs; + return rc; + } + nrs = pill->rc_req->rq_reply_state; + /* Now we need only buffers, copy first chunk */ + to = lustre_msg_buf(nrs->rs_msg, 0, 0); + from = lustre_msg_buf(rs->rs_msg, 0, 0); + len = (char *)lustre_msg_buf(rs->rs_msg, offset, 0) - from; + memcpy(to, from, len); + /* check if we have tail and copy it too */ + if (rs->rs_msg->lm_bufcount > offset + 1) { + to = lustre_msg_buf(nrs->rs_msg, offset + 1, 0); + from = lustre_msg_buf(rs->rs_msg, offset + 1, 0); + offset = rs->rs_msg->lm_bufcount - 1; + len = (char *)lustre_msg_buf(rs->rs_msg, offset, 0) + + cfs_size_round(rs->rs_msg->lm_buflens[offset]) - from; + memcpy(to, from, len); + } + /* drop old reply if everything is fine */ + if (rs->rs_difficult) { + /* copy rs data */ + int i; + + nrs->rs_difficult = 1; + nrs->rs_no_ack = rs->rs_no_ack; + for (i = 0; i < rs->rs_nlocks; i++) { + nrs->rs_locks[i] = rs->rs_locks[i]; + nrs->rs_modes[i] = rs->rs_modes[i]; + nrs->rs_nlocks++; + } + rs->rs_nlocks = 0; + rs->rs_difficult = 0; + rs->rs_no_ack = 0; + } + ptlrpc_rs_decref(rs); + return 0; +} +EXPORT_SYMBOL(req_capsule_server_grow); /* __REQ_LAYOUT_USER__ */ #endif