diff options
Diffstat (limited to 'xlators/cluster/afr')
| -rw-r--r-- | xlators/cluster/afr/src/afr-inode-read.c | 24 | ||||
| -rw-r--r-- | xlators/cluster/afr/src/afr.c | 4 |
2 files changed, 15 insertions, 13 deletions
diff --git a/xlators/cluster/afr/src/afr-inode-read.c b/xlators/cluster/afr/src/afr-inode-read.c index 2675af2bf99..d0b07e9064f 100644 --- a/xlators/cluster/afr/src/afr-inode-read.c +++ b/xlators/cluster/afr/src/afr-inode-read.c @@ -1186,7 +1186,7 @@ afr_fgetxattr_pathinfo_cbk (call_frame_t *frame, void *cookie, xattr = gf_strdup (xattr); - (void)snprintf (xattr_cky, 1024, "%s-%ld", + (void)snprintf (xattr_cky, sizeof(xattr_cky), "%s-%ld", local->cont.getxattr.name, cky); ret = dict_set_dynstr (local->dict, xattr_cky, xattr); @@ -1217,20 +1217,21 @@ unlock: + SLEN (AFR_PATHINFO_HEADER) + 4; local->cont.getxattr.xattr_len += (padding + 2); - xattr_serz = GF_CALLOC (local->cont.getxattr.xattr_len, - sizeof (char), gf_common_mt_char); + xattr_serz = GF_MALLOC (local->cont.getxattr.xattr_len, + gf_common_mt_char); if (!xattr_serz) goto unwind; /* the xlator info */ - (void) sprintf (xattr_serz, "(<"AFR_PATHINFO_HEADER"%s> ", - this->name); + int xattr_serz_len = sprintf (xattr_serz, + "(<"AFR_PATHINFO_HEADER"%s> ", + this->name); /* actual series of pathinfo */ ret = dict_serialize_value_with_delim (local->dict, xattr_serz - + strlen (xattr_serz), + + xattr_serz_len, &tlen, ' '); if (ret) { goto unwind; @@ -1342,19 +1343,20 @@ unlock: padding += strlen (this->name) + SLEN (AFR_PATHINFO_HEADER) + 4; local->cont.getxattr.xattr_len += (padding + 2); - xattr_serz = GF_CALLOC (local->cont.getxattr.xattr_len, - sizeof (char), gf_common_mt_char); + xattr_serz = GF_MALLOC (local->cont.getxattr.xattr_len, + gf_common_mt_char); if (!xattr_serz) goto unwind; /* the xlator info */ - (void) sprintf (xattr_serz, "(<"AFR_PATHINFO_HEADER"%s> ", - this->name); + int xattr_serz_len = sprintf (xattr_serz, + "(<"AFR_PATHINFO_HEADER"%s> ", + this->name); /* actual series of pathinfo */ ret = dict_serialize_value_with_delim (local->dict, - xattr_serz + strlen (xattr_serz), + xattr_serz + xattr_serz_len, &tlen, ' '); if (ret) { goto unwind; diff --git a/xlators/cluster/afr/src/afr.c b/xlators/cluster/afr/src/afr.c index dac714d5d2c..bde9a97a4e7 100644 --- a/xlators/cluster/afr/src/afr.c +++ b/xlators/cluster/afr/src/afr.c @@ -542,8 +542,8 @@ init (xlator_t *this) priv->child_up = GF_CALLOC (sizeof (unsigned char), child_count, gf_afr_mt_char); - priv->child_latency = GF_CALLOC (sizeof (*priv->child_latency), - child_count, + priv->child_latency = GF_MALLOC (sizeof (*priv->child_latency) + * child_count, gf_afr_mt_child_latency_t); if (!priv->child_up || !priv->child_latency) { |