Don't call talloc_memlimit_update() inside _talloc_realloc() when we're just manipula...
authorJeremy Allison <jra@samba.org>
Tue, 27 Aug 2013 20:03:27 +0000 (13:03 -0700)
committerJeremy Allison <jra@samba.org>
Tue, 27 Aug 2013 22:44:20 +0000 (15:44 -0700)
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Simo Sorce <idra@samba.org>
lib/talloc/talloc.c

index 2683ff074e9e5f51bd5df84886d3e374da6be179..aabd2fb762750337e3049688917d68bfa033a7ad 100644 (file)
@@ -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;