Unverified Commit 51af17e3 authored by Oran Agra's avatar Oran Agra Committed by GitHub
Browse files

Merge pull request #12141 from oranagra/fix_32bit_ci

Fix defrag CI for 32bit after merge of jemalloc 5.3
parents 07d54dc5 cded14f3
...@@ -329,7 +329,8 @@ void mallctl_int(client *c, robj **argv, int argc) { ...@@ -329,7 +329,8 @@ void mallctl_int(client *c, robj **argv, int argc) {
} }
size_t sz = sizeof(old); size_t sz = sizeof(old);
while (sz > 0) { while (sz > 0) {
if ((ret=je_mallctl(argv[0]->ptr, &old, &sz, argc > 1? &val: NULL, argc > 1?sz: 0))) { size_t zz = sz;
if ((ret=je_mallctl(argv[0]->ptr, &old, &zz, argc > 1? &val: NULL, argc > 1?sz: 0))) {
if (ret == EPERM && argc > 1) { if (ret == EPERM && argc > 1) {
/* if this option is write only, try just writing to it. */ /* if this option is write only, try just writing to it. */
if (!(ret=je_mallctl(argv[0]->ptr, NULL, 0, &val, sz))) { if (!(ret=je_mallctl(argv[0]->ptr, NULL, 0, &val, sz))) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment