shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

configure: check for prlimit

Browse Source 
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().
This commit is contained in:
Zdenek Kabelac 2019-08-26 17:19:16 +02:00
parent a50c127904
commit 55f1d8a269
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@ -1715,7 +1715,7 @@ Optional Packages:
cache_restore tool: [autodetect] cache_restore tool: [autodetect]
--with-vdo=TYPE vdo support: internal/none [internal] --with-vdo=TYPE vdo support: internal/none [internal]
--with-vdo-format=PATH vdoformat tool: [autodetect] --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 --with-ocfdir=DIR install OCF files in
[PREFIX/lib/ocf/resource.d/lvm2] [PREFIX/lib/ocf/resource.d/lvm2]
--with-default-pid-dir=PID_DIR --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 \ 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 \ setlocale strcasecmp strchr strcspn strdup strerror strncasecmp strndup \
strrchr strspn strstr strtol strtoul uname strrchr strspn strstr strtol strtoul uname
do : do :

2
configure.ac
View File

@ -153,7 +153,7 @@ AC_DEFINE([_REENTRANT], 1, [Define to use re-entrant thread safe versions])
################################################################################ ################################################################################
dnl -- Check for functions dnl -- Check for functions
AC_CHECK_FUNCS([ftruncate gethostname getpagesize gettimeofday localtime_r \ 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 \ setlocale strcasecmp strchr strcspn strdup strerror strncasecmp strndup \
strrchr strspn strstr strtol strtoul uname], , [AC_MSG_ERROR(bailing out)]) strrchr strspn strstr strtol strtoul uname], , [AC_MSG_ERROR(bailing out)])
AC_FUNC_ALLOCA AC_FUNC_ALLOCA

3
include/configure.h.in
View File

@ -292,6 +292,9 @@
/* Define to 1 if you have the <paths.h> header file. */ /* Define to 1 if you have the <paths.h> header file. */
#undef HAVE_PATHS_H #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. */ /* Define to 1 if you have the `pselect' function. */
#undef HAVE_PSELECT #undef HAVE_PSELECT

2
lib/label/label.c
View File

@ -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) static void _prepare_open_file_limit(struct cmd_context *cmd, unsigned int num_devs)
{ {
#ifdef HAVE_PRLIMIT
struct rlimit old, new; struct rlimit old, new;
unsigned int want = num_devs + BASE_FD_COUNT; unsigned int want = num_devs + BASE_FD_COUNT;
int rv; 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); log_warn("WARNING: cannot set open file limit for scanning %u devices.", num_devs);
return; return;
} }
#endif
} }
/* /*