&RQF_OST_BRW,
&RQF_OST_STATFS,
&RQF_OST_SET_INFO,
+ &RQF_OST_SET_GRANT_INFO,
&RQF_OST_GET_INFO_GENERIC,
&RQF_OST_GET_INFO_LAST_ID,
&RQF_OST_GET_INFO_FIEMAP,
};
enum rmf_flags {
- RMF_F_STRING = 1 << 0
+ RMF_F_STRING = 1 << 0,
+ RMF_F_NO_SIZE_CHECK = 1 << 1
};
struct req_capsule;
EXPORT_SYMBOL(RMF_MGS_SEND_PARAM);
const struct req_msg_field RMF_SETINFO_VAL =
- DEFINE_MSGF("setinfo_val", 0,
- sizeof(__u32), lustre_swab_generic_32s);
+ DEFINE_MSGF("setinfo_val", 0, -1, NULL);
EXPORT_SYMBOL(RMF_SETINFO_VAL);
const struct req_msg_field RMF_SEQ_OPC =
const struct req_msg_field RMF_SEQ_RANGE =
DEFINE_MSGF("seq_query_range", 0,
- sizeof(struct lu_range), lustre_swab_lu_range);
+ sizeof(struct lu_seq_range), lustre_swab_lu_seq_range);
EXPORT_SYMBOL(RMF_SEQ_RANGE);
const struct req_msg_field RMF_FLD_OPC =
const struct req_msg_field RMF_FLD_MDFLD =
DEFINE_MSGF("fld_query_mdfld", 0,
- sizeof(struct md_fld), lustre_swab_md_fld);
+ sizeof(struct lu_seq_range), lustre_swab_lu_seq_range);
EXPORT_SYMBOL(RMF_FLD_MDFLD);
const struct req_msg_field RMF_MDT_BODY =
EXPORT_SYMBOL(RMF_CONN);
const struct req_msg_field RMF_CONNECT_DATA =
- DEFINE_MSGF("cdata", 0,
+ DEFINE_MSGF("cdata",
+ RMF_F_NO_SIZE_CHECK /* we allow extra space for interop */,
sizeof(struct obd_connect_data), lustre_swab_connect);
EXPORT_SYMBOL(RMF_CONNECT_DATA);
const struct req_msg_field RMF_DLM_REQ =
- DEFINE_MSGF("dlm_req", 0,
+ DEFINE_MSGF("dlm_req", RMF_F_NO_SIZE_CHECK /* ldlm_request_bufsize */,
sizeof(struct ldlm_request), lustre_swab_ldlm_request);
EXPORT_SYMBOL(RMF_DLM_REQ);
EXPORT_SYMBOL(RMF_DLM_LVB);
const struct req_msg_field RMF_MDT_MD =
- DEFINE_MSGF("mdt_md", 0, MIN_MD_SIZE, NULL);
+ DEFINE_MSGF("mdt_md", RMF_F_NO_SIZE_CHECK, MIN_MD_SIZE, NULL);
EXPORT_SYMBOL(RMF_MDT_MD);
const struct req_msg_field RMF_REC_REINT =
EXPORT_SYMBOL(RMF_EADATA);
const struct req_msg_field RMF_ACL =
- DEFINE_MSGF("acl", 0, LUSTRE_POSIX_ACL_MAX_SIZE, NULL);
+ DEFINE_MSGF("acl", RMF_F_NO_SIZE_CHECK,
+ LUSTRE_POSIX_ACL_MAX_SIZE, NULL);
EXPORT_SYMBOL(RMF_ACL);
const struct req_msg_field RMF_LOGCOOKIES =
- DEFINE_MSGF("logcookies", 0, sizeof(struct llog_cookie), NULL);
+ DEFINE_MSGF("logcookies", RMF_F_NO_SIZE_CHECK /* multiple cookies */,
+ sizeof(struct llog_cookie), NULL);
EXPORT_SYMBOL(RMF_LOGCOOKIES);
const struct req_msg_field RMF_CAPA1 =
EXPORT_SYMBOL(RQF_MGS_TARGET_REG);
const struct req_format RQF_MGS_SET_INFO =
- DEFINE_REQ_FMT0("MGS_SET_INTO", mgs_set_info,
+ DEFINE_REQ_FMT0("MGS_SET_INFO", mgs_set_info,
mgs_set_info);
EXPORT_SYMBOL(RQF_MGS_SET_INFO);
DEFINE_REQ_FMT0("OST_SET_INFO", ost_set_info_client, empty);
EXPORT_SYMBOL(RQF_OST_SET_INFO);
+const struct req_format RQF_OST_SET_GRANT_INFO =
+ DEFINE_REQ_FMT0("OST_SET_GRANT_INFO", ost_set_info_client,
+ ost_body_only);
+EXPORT_SYMBOL(RQF_OST_SET_GRANT_INFO);
+
const struct req_format RQF_OST_GET_INFO_GENERIC =
DEFINE_REQ_FMT0("OST_GET_INFO", ost_get_info_generic_client,
ost_get_info_generic_server);
{
LASSERT(loc == RCL_SERVER || loc == RCL_CLIENT);
+ if ((size != field->rmf_size) &&
+ (field->rmf_size != -1) &&
+ !(field->rmf_flags & RMF_F_NO_SIZE_CHECK) &&
+ (size > 0)) {
+ CERROR("%s: field size mismatch %d != %d (%d)\n",
+ field->rmf_name, size, field->rmf_size, loc);
+ //LBUG();
+ }
+
pill->rc_area[loc][__req_capsule_offset(pill, field, loc)] = size;
}
EXPORT_SYMBOL(req_capsule_set_size);