diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2019-08-26 17:19:16 +0200 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2019-08-26 17:24:37 +0200 |
| commit | 55f1d8a2697c6641215604ee32181d7ead7b8d85 (patch) | |
| tree | 38b28b6cd24d7353c28a1ec36ef1b82349ede2e4 | |
| parent | a50c127904a99b5862c323ddc76bfcf760dd0805 (diff) | |
| download | lvm2-55f1d8a2697c6641215604ee32181d7ead7b8d85.tar.gz | |
configure: check for prlimit
Update configure and make code compilable if prlimit() is not present.
Since the code is suspicious do not cope yet with it's replacement
with set/getrlimit().
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | include/configure.h.in | 3 | ||||
| -rw-r--r-- | lib/label/label.c | 2 |
4 files changed, 8 insertions, 3 deletions
@@ -1715,7 +1715,7 @@ Optional Packages: cache_restore tool: [autodetect] --with-vdo=TYPE vdo support: internal/none [internal] --with-vdo-format=PATH vdoformat tool: [autodetect] - --with-writecache=TYPE writecache support: internal/none [internal] + --with-writecache=TYPE writecache support: internal/none [none] --with-ocfdir=DIR install OCF files in [PREFIX/lib/ocf/resource.d/lvm2] --with-default-pid-dir=PID_DIR @@ -6647,7 +6647,7 @@ $as_echo "#define _REENTRANT 1" >>confdefs.h ################################################################################ for ac_func in ftruncate gethostname getpagesize gettimeofday localtime_r \ - memchr memset mkdir mkfifo munmap nl_langinfo pselect realpath rmdir setenv \ + memchr memset mkdir mkfifo munmap nl_langinfo prlimit pselect realpath rmdir setenv \ setlocale strcasecmp strchr strcspn strdup strerror strncasecmp strndup \ strrchr strspn strstr strtol strtoul uname do : diff --git a/configure.ac b/configure.ac index 830edb8da..e3af0c446 100644 --- a/configure.ac +++ b/configure.ac @@ -153,7 +153,7 @@ AC_DEFINE([_REENTRANT], 1, [Define to use re-entrant thread safe versions]) ################################################################################ dnl -- Check for functions AC_CHECK_FUNCS([ftruncate gethostname getpagesize gettimeofday localtime_r \ - memchr memset mkdir mkfifo munmap nl_langinfo pselect realpath rmdir setenv \ + memchr memset mkdir mkfifo munmap nl_langinfo prlimit pselect realpath rmdir setenv \ setlocale strcasecmp strchr strcspn strdup strerror strncasecmp strndup \ strrchr strspn strstr strtol strtoul uname], , [AC_MSG_ERROR(bailing out)]) AC_FUNC_ALLOCA diff --git a/include/configure.h.in b/include/configure.h.in index a43053a58..91a3a7ddb 100644 --- a/include/configure.h.in +++ b/include/configure.h.in @@ -292,6 +292,9 @@ /* Define to 1 if you have the <paths.h> header file. */ #undef HAVE_PATHS_H +/* Define to 1 if you have the `prlimit' function. */ +#undef HAVE_PRLIMIT + /* Define to 1 if you have the `pselect' function. */ #undef HAVE_PSELECT diff --git a/lib/label/label.c b/lib/label/label.c index e786c89c6..dc4d32d15 100644 --- a/lib/label/label.c +++ b/lib/label/label.c @@ -873,6 +873,7 @@ static void _free_hints(struct dm_list *hints) static void _prepare_open_file_limit(struct cmd_context *cmd, unsigned int num_devs) { +#ifdef HAVE_PRLIMIT struct rlimit old, new; unsigned int want = num_devs + BASE_FD_COUNT; int rv; @@ -909,6 +910,7 @@ static void _prepare_open_file_limit(struct cmd_context *cmd, unsigned int num_d log_warn("WARNING: cannot set open file limit for scanning %u devices.", num_devs); return; } +#endif } /* |