From 29893bcba579f7e37a6ace018ffda1c8abe45550 Mon Sep 17 00:00:00 2001 From: Amar Tumballi Date: Thu, 24 Jun 2010 07:58:51 +0000 Subject: added proper mem-types to GF_CALLOC in protocol Signed-off-by: Amar Tumballi Signed-off-by: Anand V. Avati BUG: 875 (Implement a new protocol to provide proper backward/forward compatibility) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=875 --- xlators/protocol/server/src/server3_1-fops.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'xlators/protocol/server/src/server3_1-fops.c') diff --git a/xlators/protocol/server/src/server3_1-fops.c b/xlators/protocol/server/src/server3_1-fops.c index 54dda8964a0..6dee758e777 100644 --- a/xlators/protocol/server/src/server3_1-fops.c +++ b/xlators/protocol/server/src/server3_1-fops.c @@ -105,7 +105,8 @@ server_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this, } if ((op_ret >= 0) && dict) { - rsp.dict.dict_val = GF_CALLOC (1, rsp.dict.dict_len, 0); + rsp.dict.dict_val = GF_CALLOC (1, rsp.dict.dict_len, + gf_server_mt_rsp_buf_t); if (!rsp.dict.dict_val) { op_ret = -1; op_errno = ENOMEM; @@ -695,7 +696,8 @@ server_getxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, goto out; } - rsp.dict.dict_val = GF_CALLOC (len, sizeof (char), 0); + rsp.dict.dict_val = GF_CALLOC (len, sizeof (char), + gf_server_mt_rsp_buf_t); if (!rsp.dict.dict_val) { op_ret = -1; op_errno = ENOMEM; @@ -755,7 +757,7 @@ server_fgetxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, len = 0; goto out; } - rsp.dict.dict_val = GF_CALLOC (1, len, 0); + rsp.dict.dict_val = GF_CALLOC (1, len, gf_server_mt_rsp_buf_t); if (!rsp.dict.dict_val) { op_ret = -1; op_errno = ENOMEM; @@ -1640,7 +1642,7 @@ server_xattrop_cbk (call_frame_t *frame, void *cookie, xlator_t *this, len = 0; goto out; } - rsp.dict.dict_val = GF_CALLOC (1, len, 0); + rsp.dict.dict_val = GF_CALLOC (1, len, gf_server_mt_rsp_buf_t); if (!rsp.dict.dict_val) { op_ret = -1; op_errno = ENOMEM; @@ -1709,7 +1711,7 @@ server_fxattrop_cbk (call_frame_t *frame, void *cookie, xlator_t *this, len = 0; goto out; } - rsp.dict.dict_val = GF_CALLOC (1, len, 0); + rsp.dict.dict_val = GF_CALLOC (1, len, gf_server_mt_rsp_buf_t); if (!rsp.dict.dict_val) { op_ret = -1; op_errno = ENOMEM; -- cgit