X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Finclude%2Flustre_req_layout.h;h=9d859a8989b46cfa14eeda7a13c3ad799ad146c5;hp=1a834ea966603f01abeed3d68a88f8d73375a087;hb=044fbff00b25f127560338d35caa4d89faa4c207;hpb=8abb5a19e4375f194f3f7d304ad46ec7120e733f diff --git a/lustre/include/lustre_req_layout.h b/lustre/include/lustre_req_layout.h index 1a834ea..9d859a8 100644 --- a/lustre/include/lustre_req_layout.h +++ b/lustre/include/lustre_req_layout.h @@ -27,7 +27,7 @@ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2011, 2013, Intel Corporation. + * Copyright (c) 2011, 2014, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -83,7 +83,8 @@ void req_capsule_set(struct req_capsule *pill, const struct req_format *fmt); void req_capsule_client_dump(struct req_capsule *pill); void req_capsule_server_dump(struct req_capsule *pill); void req_capsule_init_area(struct req_capsule *pill); -int req_capsule_filled_sizes(struct req_capsule *pill, enum req_location loc); +size_t req_capsule_filled_sizes(struct req_capsule *pill, + enum req_location loc); int req_capsule_server_pack(struct req_capsule *pill); void *req_capsule_client_get(struct req_capsule *pill, @@ -92,30 +93,30 @@ void *req_capsule_client_swab_get(struct req_capsule *pill, const struct req_msg_field *field, void *swabber); void *req_capsule_client_sized_get(struct req_capsule *pill, - const struct req_msg_field *field, - int len); + const struct req_msg_field *field, + __u32 len); void *req_capsule_server_get(struct req_capsule *pill, const struct req_msg_field *field); void *req_capsule_server_sized_get(struct req_capsule *pill, - const struct req_msg_field *field, - int len); + const struct req_msg_field *field, + __u32 len); void *req_capsule_server_swab_get(struct req_capsule *pill, const struct req_msg_field *field, void *swabber); void *req_capsule_server_sized_swab_get(struct req_capsule *pill, const struct req_msg_field *field, - int len, void *swabber); + __u32 len, void *swabber); const void *req_capsule_other_get(struct req_capsule *pill, const struct req_msg_field *field); void req_capsule_set_size(struct req_capsule *pill, - const struct req_msg_field *field, - enum req_location loc, int size); -int req_capsule_get_size(const struct req_capsule *pill, - const struct req_msg_field *field, - enum req_location loc); -int req_capsule_msg_size(struct req_capsule *pill, enum req_location loc); -int req_capsule_fmt_size(__u32 magic, const struct req_format *fmt, + const struct req_msg_field *field, + enum req_location loc, __u32 size); +__u32 req_capsule_get_size(const struct req_capsule *pill, + const struct req_msg_field *field, + enum req_location loc); +__u32 req_capsule_msg_size(struct req_capsule *pill, enum req_location loc); +__u32 req_capsule_fmt_size(__u32 magic, const struct req_format *fmt, enum req_location loc); void req_capsule_extend(struct req_capsule *pill, const struct req_format *fmt); @@ -126,12 +127,12 @@ int req_capsule_field_present(const struct req_capsule *pill, const struct req_msg_field *field, enum req_location loc); void req_capsule_shrink(struct req_capsule *pill, - const struct req_msg_field *field, - unsigned int newlen, - enum req_location loc); + const struct req_msg_field *field, + __u32 newlen, + enum req_location loc); int req_capsule_server_grow(struct req_capsule *pill, - const struct req_msg_field *field, - unsigned int newlen); + const struct req_msg_field *field, + __u32 newlen); int req_layout_init(void); void req_layout_fini(void); @@ -165,16 +166,11 @@ extern struct req_format RQF_OUT_UPDATE; */ extern struct req_format RQF_MDS_GETATTR_NAME; extern struct req_format RQF_MDS_CLOSE; -extern struct req_format RQF_MDS_RELEASE_CLOSE; -extern struct req_format RQF_MDS_PIN; -extern struct req_format RQF_MDS_UNPIN; +extern struct req_format RQF_MDS_INTENT_CLOSE; extern struct req_format RQF_MDS_CONNECT; extern struct req_format RQF_MDS_DISCONNECT; extern struct req_format RQF_MDS_GET_INFO; extern struct req_format RQF_MDS_READPAGE; -extern struct req_format RQF_MDS_WRITEPAGE; -extern struct req_format RQF_MDS_IS_SUBDIR; -extern struct req_format RQF_MDS_DONE_WRITING; extern struct req_format RQF_MDS_REINT; extern struct req_format RQF_MDS_REINT_CREATE; extern struct req_format RQF_MDS_REINT_CREATE_RMT_ACL; @@ -186,9 +182,7 @@ extern struct req_format RQF_MDS_REINT_LINK; extern struct req_format RQF_MDS_REINT_RENAME; extern struct req_format RQF_MDS_REINT_SETATTR; extern struct req_format RQF_MDS_REINT_SETXATTR; -extern struct req_format RQF_MDS_QUOTACHECK; extern struct req_format RQF_MDS_QUOTACTL; -extern struct req_format RQF_QC_CALLBACK; extern struct req_format RQF_QUOTA_DQACQ; extern struct req_format RQF_MDS_SWAP_LAYOUTS; /* MDS hsm formats */ @@ -202,7 +196,6 @@ extern struct req_format RQF_MDS_HSM_REQUEST; /* OST req_format */ extern struct req_format RQF_OST_CONNECT; extern struct req_format RQF_OST_DISCONNECT; -extern struct req_format RQF_OST_QUOTACHECK; extern struct req_format RQF_OST_QUOTACTL; extern struct req_format RQF_OST_GETATTR; extern struct req_format RQF_OST_SETATTR; @@ -341,6 +334,8 @@ extern struct req_msg_field RMF_U32; /* OBJ update format */ extern struct req_msg_field RMF_OUT_UPDATE; extern struct req_msg_field RMF_OUT_UPDATE_REPLY; +extern struct req_msg_field RMF_OUT_UPDATE_HEADER; +extern struct req_msg_field RMF_OUT_UPDATE_BUF; /* LFSCK format */ extern struct req_msg_field RMF_LFSCK_REQUEST;