X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre_update.h;h=78cd3d4bfdd5190667774d291a0b3d751ebfca84;hb=c438fba7f068b0713d96dce1f0183ec6da7ab000;hp=1ec8b4d24cb55c0535be3694db6dbafa84f77189;hpb=12d6356a48de70922975e38451059211c753252e;p=fs%2Flustre-release.git diff --git a/lustre/include/lustre_update.h b/lustre/include/lustre_update.h index 1ec8b4d..78cd3d4 100644 --- a/lustre/include/lustre_update.h +++ b/lustre/include/lustre_update.h @@ -20,7 +20,7 @@ * GPL HEADER END */ /* - * Copyright (c) 2013, 2015, Intel Corporation. + * Copyright (c) 2013, 2017, Intel Corporation. */ /* * lustre/include/lustre_update.h @@ -30,10 +30,10 @@ #ifndef _LUSTRE_UPDATE_H #define _LUSTRE_UPDATE_H -#include #include +#include +#include -#define OUT_UPDATE_INIT_BUFFER_SIZE 4096 #define OUT_UPDATE_REPLY_SIZE 4096 #define OUT_BULK_BUFFER_SIZE 4096 @@ -130,6 +130,21 @@ update_records_get_params(const struct update_records *record) update_ops_size(&record->ur_ops, record->ur_update_count)); } +static inline struct update_param * +update_param_next_param(const struct update_param *param) +{ + return (struct update_param *)((char *)param + + object_update_param_size( + (struct object_update_param *)param)); +} + +static inline size_t +__update_records_size(size_t raw_size) +{ + return cfs_size_round(offsetof(struct update_records, ur_ops) + + raw_size); +} + static inline size_t update_records_size(const struct update_records *record) { @@ -146,18 +161,23 @@ update_records_size(const struct update_records *record) param_size = update_params_size(params, record->ur_param_count); } - return cfs_size_round(offsetof(struct update_records, ur_ops) + - op_size + param_size); + return __update_records_size(op_size + param_size); } static inline size_t -llog_update_record_size(const struct llog_update_record *lur) +__llog_update_record_size(size_t records_size) { - return cfs_size_round(sizeof(lur->lur_hdr) + - update_records_size(&lur->lur_update_rec) + + return cfs_size_round(sizeof(struct llog_rec_hdr) + records_size + sizeof(struct llog_rec_tail)); } +static inline size_t +llog_update_record_size(const struct llog_update_record *lur) +{ + return __llog_update_record_size( + update_records_size(&lur->lur_update_rec)); +} + static inline struct update_op * update_ops_get_op(const struct update_ops *ops, unsigned int index, unsigned int update_count) @@ -194,7 +214,7 @@ static inline void *size = param->oup_len; if (param->oup_len == 0) - return NULL; + return ERR_PTR(-ENODATA); return (void *)¶m->oup_buf[0]; } @@ -221,18 +241,15 @@ object_update_result_insert(struct object_update_reply *reply, int rc) { struct object_update_result *update_result; - char *ptr; update_result = object_update_result_get(reply, index, NULL); - LASSERT(update_result != NULL); + LASSERT(update_result); update_result->our_rc = ptlrpc_status_hton(rc); - if (data != NULL && data_len > 0) { - LASSERT(data != NULL); - ptr = (char *)update_result + - cfs_size_round(sizeof(struct object_update_reply)); + if (rc >= 0) { + if (data_len > 0 && data) + memcpy(update_result->our_data, data, data_len); update_result->our_datalen = data_len; - memcpy(ptr, data, data_len); } reply->ourp_lens[index] = cfs_size_round(data_len + @@ -269,11 +286,11 @@ object_update_result_data_get(const struct object_update_reply *reply, * distribution. */ struct thandle_update_records { - /* All of updates for the cross-MDT operation. */ + /* All of updates for the cross-MDT operation, vmalloc'd. */ struct llog_update_record *tur_update_records; size_t tur_update_records_buf_size; - /* All of parameters for the cross-MDT operation */ + /* All of parameters for the cross-MDT operation, vmalloc'd */ struct update_params *tur_update_params; unsigned int tur_update_param_count; size_t tur_update_params_buf_size; @@ -330,7 +347,8 @@ struct sub_thandle { /* If this sub thandle is committed */ bool st_committed:1, - st_stopped:1; + st_stopped:1, + st_started:1; }; struct tx_arg; @@ -396,10 +414,8 @@ int out_create_pack(const struct lu_env *env, struct object_update *update, size_t *max_update_size, const struct lu_fid *fid, const struct lu_attr *attr, struct dt_allocation_hint *hint, struct dt_object_format *dof); -int out_object_destroy_pack(const struct lu_env *env, - struct object_update *update, - size_t *max_update_size, - const struct lu_fid *fid); +int out_destroy_pack(const struct lu_env *env, struct object_update *update, + size_t *max_update_size, const struct lu_fid *fid); int out_index_delete_pack(const struct lu_env *env, struct object_update *update, size_t *max_update_size, const struct lu_fid *fid, const struct dt_key *key); @@ -438,6 +454,9 @@ int out_xattr_get_pack(const struct lu_env *env, struct object_update *update, size_t *max_update_size, const struct lu_fid *fid, const char *name, const int bufsize); +int out_xattr_list_pack(const struct lu_env *env, struct object_update *update, + size_t *max_update_size, const struct lu_fid *fid, + const int bufsize); int out_read_pack(const struct lu_env *env, struct object_update *update, size_t *max_update_length, const struct lu_fid *fid, size_t size, loff_t pos); @@ -494,8 +513,8 @@ size_t update_records_ref_add_size(const struct lu_env *env, const struct lu_fid *fid); size_t update_records_ref_del_size(const struct lu_env *env, const struct lu_fid *fid); -size_t update_records_object_destroy_size(const struct lu_env *env, - const struct lu_fid *fid); +size_t update_records_destroy_size(const struct lu_env *env, + const struct lu_fid *fid); size_t update_records_index_insert_size(const struct lu_env *env, const struct lu_fid *fid, const struct dt_rec *rec, @@ -555,14 +574,13 @@ int update_records_ref_del_pack(const struct lu_env *env, unsigned int *param_count, size_t *max_param_size, const struct lu_fid *fid); -int update_records_object_destroy_pack(const struct lu_env *env, - struct update_ops *ops, - unsigned int *op_count, - size_t *max_ops_size, - struct update_params *params, - unsigned int *param_count, - size_t *max_param_size, - const struct lu_fid *fid); +int update_records_destroy_pack(const struct lu_env *env, + struct update_ops *ops, unsigned int *op_count, + size_t *max_ops_size, + struct update_params *params, + unsigned int *param_count, + size_t *max_param_size, + const struct lu_fid *fid); int update_records_index_insert_pack(const struct lu_env *env, struct update_ops *ops, unsigned int *op_count,