mirror of
https://github.com/haproxy/haproxy.git
synced 2026-06-07 15:52:10 -04:00
MINOR: pools: make sure 'no-memory-trimming' is always used
The global option 'no-memory-trimming' was added in 2.6 with commit
c4e56dc58 ("MINOR: pools: add a new global option "no-memory-trimming"")
but there were some cases left where it was not considered. Let's make
is_trim_enabled() also consider it.
This commit is contained in:
parent
f4e7616e6c
commit
4db0b0430d
1 changed files with 1 additions and 1 deletions
|
|
@ -213,7 +213,7 @@ static void detect_allocator(void)
|
|||
|
||||
int is_trim_enabled(void)
|
||||
{
|
||||
return using_default_allocator;
|
||||
return !disable_trim && using_default_allocator;
|
||||
}
|
||||
|
||||
static int mem_should_fail(const struct pool_head *pool)
|
||||
|
|
|
|||
Loading…
Reference in a new issue