From dc6f7acaeda69ac0765812b3d961197a68ef9bf5 Mon Sep 17 00:00:00 2001 From: Pranith Kumar K Date: Sat, 22 Mar 2014 19:30:45 +0530 Subject: encryption/crypt: Add mem-accounting for crypt xlator Without these changes crypt.t crashes when compiled with -DDEBUG Change-Id: I1f7372aa30a09dbe3ae81d1dd598cf36e17fe0b7 BUG: 1030058 Signed-off-by: Pranith Kumar K Reviewed-on: http://review.gluster.org/7319 Tested-by: Gluster Build System Reviewed-by: Vijay Bellur --- xlators/encryption/crypt/src/crypt-mem-types.h | 1 + xlators/encryption/crypt/src/crypt.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) (limited to 'xlators/encryption/crypt/src') diff --git a/xlators/encryption/crypt/src/crypt-mem-types.h b/xlators/encryption/crypt/src/crypt-mem-types.h index 799727573c3..2eab921fcba 100644 --- a/xlators/encryption/crypt/src/crypt-mem-types.h +++ b/xlators/encryption/crypt/src/crypt-mem-types.h @@ -24,6 +24,7 @@ enum gf_crypt_mem_types_ { gf_crypt_mt_key, gf_crypt_mt_iovec, gf_crypt_mt_char, + gf_crypt_mt_end, }; #endif /* __CRYPT_MEM_TYPES_H__ */ diff --git a/xlators/encryption/crypt/src/crypt.c b/xlators/encryption/crypt/src/crypt.c index becff3e4763..1abdad31d99 100644 --- a/xlators/encryption/crypt/src/crypt.c +++ b/xlators/encryption/crypt/src/crypt.c @@ -4380,6 +4380,25 @@ static void crypt_free_private(xlator_t *this) } } +int32_t +mem_acct_init (xlator_t *this) +{ + int ret = -1; + + if (!this) + return ret; + + ret = xlator_mem_acct_init (this, gf_crypt_mt_end); + + if (ret != 0) { + gf_log(this->name, GF_LOG_ERROR, "Memory accounting init" + "failed"); + return ret; + } + + return ret; +} + int32_t reconfigure (xlator_t *this, dict_t *options) { int32_t ret = -1; -- cgit