From: Lennart Poettering Date: Thu, 11 Oct 2018 16:31:11 +0000 (+0200) Subject: main: introduce a define HIGH_RLIMIT_MEMLOCK similar to HIGH_RLIMIT_NOFILE X-Git-Tag: v240~533^2~2 X-Git-Url: http://git-history.diyao.me/?a=commitdiff_plain;h=c8884aceefc85245b9bdfb626e2daf27521259bd;p=systemd%2F.git main: introduce a define HIGH_RLIMIT_MEMLOCK similar to HIGH_RLIMIT_NOFILE --- diff --git a/src/basic/def.h b/src/basic/def.h index 05e352bc4f..65ad659999 100644 --- a/src/basic/def.h +++ b/src/basic/def.h @@ -77,3 +77,4 @@ #define LONG_LINE_MAX (1U*1024U*1024U) #define HIGH_RLIMIT_NOFILE (256*1024) +#define HIGH_RLIMIT_MEMLOCK (1024ULL*1024ULL*64ULL) diff --git a/src/core/main.c b/src/core/main.c index 6b910fc91a..1a95486c03 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -1304,7 +1304,7 @@ static int bump_rlimit_memlock(struct rlimit *saved_rlimit) { if (getrlimit(RLIMIT_MEMLOCK, saved_rlimit) < 0) return log_warning_errno(errno, "Reading RLIMIT_MEMLOCK failed, ignoring: %m"); - r = setrlimit_closest(RLIMIT_MEMLOCK, &RLIMIT_MAKE_CONST(1024ULL*1024ULL*64ULL)); + r = setrlimit_closest(RLIMIT_MEMLOCK, &RLIMIT_MAKE_CONST(HIGH_RLIMIT_MEMLOCK)); if (r < 0) return log_warning_errno(r, "Setting RLIMIT_MEMLOCK failed, ignoring: %m");