2 files changed, 8 insertions, 28 deletions

diff --git a/xlators/protocol/client/src/client-helpers.c b/xlators/protocol/client/src/client-helpers.c
index 156f1cd3d9b..e49647faa6f 100644
--- a/xlators/protocol/client/src/client-helpers.c
+++ b/xlators/protocol/client/src/client-helpers.c
@@ -175,7 +175,6 @@ unserialize_rsp_direntp(xlator_t *this, fd_t *fd, struct gfs3_readdirp_rsp *rsp,
                         gf_dirent_t *entries)
 {
     struct gfs3_dirplist *trav = NULL;
-    char *buf = NULL;
     gf_dirent_t *entry = NULL;
     inode_table_t *itable = NULL;
     int entry_len = 0;
@@ -207,22 +206,18 @@ unserialize_rsp_direntp(xlator_t *this, fd_t *fd, struct gfs3_readdirp_rsp *rsp,
         strcpy(entry->d_name, trav->name);
 
         if (trav->dict.dict_val) {
-            /* Dictionary is sent along with response */
-            buf = gf_memdup(trav->dict.dict_val, trav->dict.dict_len);
-            if (!buf)
-                goto out;
-
             entry->dict = dict_new();
+            if (!entry->dict)
+                goto out;
 
-            ret = dict_unserialize(buf, trav->dict.dict_len, &entry->dict);
+            ret = dict_unserialize(trav->dict.dict_val, trav->dict.dict_len,
+                                   &entry->dict);
             if (ret < 0) {
                 gf_msg(THIS->name, GF_LOG_WARNING, EINVAL,
                        PC_MSG_DICT_UNSERIALIZE_FAIL,
                        "failed to unserialize xattr dict");
                 goto out;
             }
-            GF_FREE(buf);
-            buf = NULL;
         }
 
         entry->inode = inode_find(itable, entry->d_stat.ia_gfid);
@@ -237,8 +232,6 @@ unserialize_rsp_direntp(xlator_t *this, fd_t *fd, struct gfs3_readdirp_rsp *rsp,
 
     ret = 0;
 out:
-    if (buf)
-        GF_FREE(buf);
     if (entry)
         gf_dirent_entry_free(entry);
     return ret;
diff --git a/xlators/protocol/server/src/server-handshake.c b/xlators/protocol/server/src/server-handshake.c
index dda58b60ca0..6e584a7560d 100644
--- a/xlators/protocol/server/src/server-handshake.c
+++ b/xlators/protocol/server/src/server-handshake.c
@@ -240,7 +240,6 @@ server_setvolume(rpcsvc_request_t *req)
     int32_t ret = -1;
     int32_t op_ret = -1;
     int32_t op_errno = EINVAL;
-    char *buf = NULL;
     uint32_t opversion = 0;
     rpc_transport_t *xprt = NULL;
     int32_t fop_version = 0;
@@ -267,18 +266,11 @@ server_setvolume(rpcsvc_request_t *req)
      */
     config_params = dict_copy_with_ref(this->options, NULL);
 
-    buf = gf_memdup(args.dict.dict_val, args.dict.dict_len);
-    if (buf == NULL) {
-        op_ret = -1;
-        op_errno = ENOMEM;
-        goto fail;
-    }
-
-    ret = dict_unserialize(buf, args.dict.dict_len, &params);
+    ret = dict_unserialize(args.dict.dict_val, args.dict.dict_len, &params);
     if (ret < 0) {
-        ret = dict_set_str(reply, "ERROR",
-                           "Internal error: failed to unserialize "
-                           "request dictionary");
+        ret = dict_set_sizen_str_sizen(reply, "ERROR",
+                                       "Internal error: failed to unserialize "
+                                       "request dictionary");
         if (ret < 0)
             gf_msg_debug(this->name, 0,
                          "failed to set error "
@@ -291,9 +283,6 @@ server_setvolume(rpcsvc_request_t *req)
         goto fail;
     }
 
-    params->extra_free = buf;
-    buf = NULL;
-
     ret = dict_get_str(params, "remote-subvolume", &name);
     if (ret < 0) {
         ret = dict_set_str(reply, "ERROR",
@@ -727,8 +716,6 @@ fail:
         dict_unref(config_params);
     }
 
-    GF_FREE(buf);
-
     return 0;
 }