diff options
| author | Yaniv Kaul <ykaul@redhat.com> | 2019-06-02 21:14:18 +0300 |
|---|---|---|
| committer | Amar Tumballi <amarts@redhat.com> | 2019-07-22 11:41:13 +0000 |
| commit | 5c20a688fd2408ff8dcc66fd8ebc935e228dd803 (patch) | |
| tree | 6205e6c84aea40d964b76323629422c68511365f /xlators/cluster/ec/src | |
| parent | 06e92a2ee437c1a81c815129b1d188af0b4fa84e (diff) | |
(multiple files) use dict_allocate_and_serialize() where applicable.
This function does length, allocation and serialization for you.
Change-Id: I142a259952a2fe83dd719442afaefe4a43a8e55e
updates: bz#1193929
Signed-off-by: Yaniv Kaul <ykaul@redhat.com>
Diffstat (limited to 'xlators/cluster/ec/src')
| -rw-r--r-- | xlators/cluster/ec/src/ec-combine.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/xlators/cluster/ec/src/ec-combine.c b/xlators/cluster/ec/src/ec-combine.c index c5af2ab5e39..dedcfb076a2 100644 --- a/xlators/cluster/ec/src/ec-combine.c +++ b/xlators/cluster/ec/src/ec-combine.c @@ -485,22 +485,12 @@ ec_dict_data_merge(ec_cbk_data_t *cbk, int32_t which, char *key) tmp = NULL; - len = dict_serialized_length(lockinfo); - if (len < 0) { - err = len; - - goto out; - } - ptr = GF_MALLOC(len, gf_common_mt_char); - if (ptr == NULL) { - err = -ENOMEM; - - goto out; - } - err = dict_serialize(lockinfo, ptr); + err = dict_allocate_and_serialize(lockinfo, (char **)&ptr, + (unsigned int *)&len); if (err != 0) { goto out; } + dict = (which == EC_COMBINE_XDATA) ? cbk->xdata : cbk->dict; err = dict_set_dynptr(dict, key, ptr, len); if (err != 0) { |