summaryrefslogtreecommitdiffstats
path: root/rpc/xdr/src/glusterfs3.h
diff options
context:
space:
mode:
authorAmar Tumballi <amarts@redhat.com>2019-03-05 08:39:16 +0530
committerAmar Tumballi <amarts@redhat.com>2019-03-08 09:38:35 +0000
commite9bfe11475c715e431d005087a0fa0fb66aef033 (patch)
treefc5842a0c4ba5415382c2b3e4fd470e2c3d387f2 /rpc/xdr/src/glusterfs3.h
parenta858dd1c310ee25b2fcd7aefc3a6caabe8560d4f (diff)
dict: handle STR_OLD data type in xdr conversions
Currently a dict conversion on wire for 3.x protocol happens using `dict_unserialize()`, which sets the type of data as STR_OLD. But the new protocol doesn't send it over the wire as its not considered as a valid format in new processes. But considering we deal with old and new protocol when we do a rolling upgrade, it will allow us to get all the information properly with new protocol. Credits: Krutika Dhananjay Fixes: bz#1684385 Change-Id: I165c0021fb195b399790b9cf14a7416ae75ec84f Signed-off-by: Amar Tumballi <amarts@redhat.com>
Diffstat (limited to 'rpc/xdr/src/glusterfs3.h')
-rw-r--r--rpc/xdr/src/glusterfs3.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/rpc/xdr/src/glusterfs3.h b/rpc/xdr/src/glusterfs3.h
index 0de7cb8..5521f4d 100644
--- a/rpc/xdr/src/glusterfs3.h
+++ b/rpc/xdr/src/glusterfs3.h
@@ -728,6 +728,7 @@ dict_to_xdr(dict_t *this, gfx_dict *dict)
break;
case GF_DATA_TYPE_PTR:
+ case GF_DATA_TYPE_STR_OLD:
index++;
/* Ideally, each type of data stored in dictionary
should have type. A pointer type shouldn't be
@@ -854,6 +855,7 @@ xdr_to_dict(gfx_dict *dict, dict_t **to)
ret = dict_set_iatt(this, key, iatt, false);
break;
case GF_DATA_TYPE_PTR:
+ case GF_DATA_TYPE_STR_OLD:
value = GF_MALLOC(xpair->value.gfx_value_u.other.other_len + 1,
gf_common_mt_char);
if (!value) {