From 314508dd73105138d756f4ca3dfb65f1d368a9f7 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 27 Aug 2013 13:03:27 -0700 Subject: Don't call talloc_memlimit_update() inside _talloc_realloc() when we're just manipulating pool members. Signed-off-by: Jeremy Allison Reviewed-by: Simo Sorce --- lib/talloc/talloc.c | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'lib') diff --git a/lib/talloc/talloc.c b/lib/talloc/talloc.c index 2683ff074e..aabd2fb762 100644 --- a/lib/talloc/talloc.c +++ b/lib/talloc/talloc.c @@ -1629,14 +1629,6 @@ _PUBLIC_ void *_talloc_realloc(const void *context, void *ptr, size_t size, cons if (new_chunk_size == old_chunk_size) { TC_UNDEFINE_GROW_CHUNK(tc, size); tc->flags &= ~TALLOC_FLAG_FREE; - if (!talloc_memlimit_update(tc->limit, - tc->size, size)) { - talloc_abort("cur_size memlimit counter not" - " correct!"); - errno = EINVAL; - return NULL; - } - tc->size = size; return ptr; } @@ -1652,13 +1644,6 @@ _PUBLIC_ void *_talloc_realloc(const void *context, void *ptr, size_t size, cons if (space_left >= space_needed) { TC_UNDEFINE_GROW_CHUNK(tc, size); tc->flags &= ~TALLOC_FLAG_FREE; - if (!talloc_memlimit_update(tc->limit, - tc->size, size)) { - talloc_abort("cur_size memlimit " - "counter not correct!"); - errno = EINVAL; - return NULL; - } tc->size = size; pool_tc->hdr.c.pool = tc_next_chunk(tc); return ptr; -- cgit