summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--glusterfsd/src/glusterfsd-mgmt.c2
-rw-r--r--libglusterfs/src/inode.c2
-rw-r--r--libglusterfs/src/stack.c16
3 files changed, 13 insertions, 7 deletions
diff --git a/glusterfsd/src/glusterfsd-mgmt.c b/glusterfsd/src/glusterfsd-mgmt.c
index 4220baf982c..5afa558dd70 100644
--- a/glusterfsd/src/glusterfsd-mgmt.c
+++ b/glusterfsd/src/glusterfsd-mgmt.c
@@ -932,6 +932,8 @@ glusterfs_handle_brick_status (rpcsvc_request_t *req)
out:
if (dict)
dict_unref (dict);
+ if (output)
+ dict_unref (output);
if (brick_req.input.input_val)
free (brick_req.input.input_val);
if (xname)
diff --git a/libglusterfs/src/inode.c b/libglusterfs/src/inode.c
index 67752da716c..3fad499ebcb 100644
--- a/libglusterfs/src/inode.c
+++ b/libglusterfs/src/inode.c
@@ -1652,7 +1652,7 @@ inode_dump_to_dict (inode_t *inode, char *prefix, dict_t *dict)
memset (key, 0, sizeof (key));
snprintf (key, sizeof (key), "%s.gfid", prefix);
- ret = dict_set_str (dict, key, gf_strdup (uuid_utoa (inode->gfid)));
+ ret = dict_set_dynstr (dict, key, gf_strdup (uuid_utoa (inode->gfid)));
if (ret)
goto out;
diff --git a/libglusterfs/src/stack.c b/libglusterfs/src/stack.c
index 29b44aedfac..787f9a318ca 100644
--- a/libglusterfs/src/stack.c
+++ b/libglusterfs/src/stack.c
@@ -186,7 +186,7 @@ gf_proc_dump_call_frame_to_dict (call_frame_t *call_frame,
memset (key, 0, sizeof (key));
snprintf (key, sizeof (key), "%s.translator", prefix);
- ret = dict_set_str (dict, key, gf_strdup (tmp_frame.this->name));
+ ret = dict_set_dynstr (dict, key, gf_strdup (tmp_frame.this->name));
if (ret)
return;
@@ -199,7 +199,7 @@ gf_proc_dump_call_frame_to_dict (call_frame_t *call_frame,
if (tmp_frame.parent) {
memset (key, 0, sizeof (key));
snprintf (key, sizeof (key), "%s.parent", prefix);
- ret = dict_set_str (dict, key,
+ ret = dict_set_dynstr (dict, key,
gf_strdup (tmp_frame.parent->this->name));
if (ret)
return;
@@ -208,7 +208,8 @@ gf_proc_dump_call_frame_to_dict (call_frame_t *call_frame,
if (tmp_frame.wind_from) {
memset (key, 0, sizeof (key));
snprintf (key, sizeof (key), "%s.windfrom", prefix);
- ret = dict_set_str (dict, key, gf_strdup (tmp_frame.wind_from));
+ ret = dict_set_dynstr (dict, key,
+ gf_strdup (tmp_frame.wind_from));
if (ret)
return;
}
@@ -216,7 +217,8 @@ gf_proc_dump_call_frame_to_dict (call_frame_t *call_frame,
if (tmp_frame.wind_to) {
memset (key, 0, sizeof (key));
snprintf (key, sizeof (key), "%s.windto", prefix);
- ret = dict_set_str (dict, key, gf_strdup (tmp_frame.wind_to));
+ ret = dict_set_dynstr (dict, key,
+ gf_strdup (tmp_frame.wind_to));
if (ret)
return;
}
@@ -224,7 +226,8 @@ gf_proc_dump_call_frame_to_dict (call_frame_t *call_frame,
if (tmp_frame.unwind_from) {
memset (key, 0, sizeof (key));
snprintf (key, sizeof (key), "%s.unwindfrom", prefix);
- ret = dict_set_str (dict, key, gf_strdup (tmp_frame.unwind_from));
+ ret = dict_set_dynstr (dict, key,
+ gf_strdup (tmp_frame.unwind_from));
if (ret)
return;
}
@@ -232,7 +235,8 @@ gf_proc_dump_call_frame_to_dict (call_frame_t *call_frame,
if (tmp_frame.unwind_to) {
memset (key, 0, sizeof (key));
snprintf (key, sizeof (key), "%s.unwind_to", prefix);
- ret = dict_set_str (dict, key, gf_strdup (tmp_frame.unwind_to));
+ ret = dict_set_dynstr (dict, key,
+ gf_strdup (tmp_frame.unwind_to));
}
return;