shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-22 17:35:59 +03:00
Code Releases Activity

liblvm2cmd: add return code for _close_stray_fds

Browse Source 
Close fds via /proc/self/fd parsing
Return error code if _close_stray_fds fails and quit application
if system is in some nonstandard state.
This commit is contained in:
Zdenek Kabelac 2012-03-15 01:18:23 +01:00
parent 98bcfdca83
commit 1f30e048bd
2 changed files with 37 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW
View File

@ -1,5 +1,6 @@
Version 2.02.98 - Version 2.02.98 -
================================= =================================
Use /proc/self/fd for closing openned descriptors.
Add missing pkg init with --enable-testing in configure.in (2.02.71). Add missing pkg init with --enable-testing in configure.in (2.02.71).
Fix inability to create, extend or convert to a large (> 1TiB) RAID LV. Fix inability to create, extend or convert to a large (> 1TiB) RAID LV.
Add (p)artial attribute to lvs. Add (p)artial attribute to lvs.

41
tools/lvmcmdline.c
View File

@ -25,6 +25,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <time.h> #include <time.h>
#include <sys/resource.h> #include <sys/resource.h>
#include <dirent.h>
#ifdef HAVE_GETOPTLONG #ifdef HAVE_GETOPTLONG
# include <getopt.h> # include <getopt.h>
@ -1252,26 +1253,49 @@ static void _close_descriptor(int fd, unsigned suppress_warnings,
fprintf(stderr, " Parent PID %" PRIpid_t ": %s\n", ppid, parent_cmdline); fprintf(stderr, " Parent PID %" PRIpid_t ": %s\n", ppid, parent_cmdline);
} }
static void _close_stray_fds(const char *command) static int _close_stray_fds(const char *command)
{ {
struct rlimit rlim; struct rlimit rlim;
int fd; int fd;
unsigned suppress_warnings = 0; unsigned suppress_warnings = 0;
pid_t ppid = getppid(); pid_t ppid = getppid();
const char *parent_cmdline = _get_cmdline(ppid); const char *parent_cmdline = _get_cmdline(ppid);
static const char _fd_dir[] = DEFAULT_PROC_DIR "/self/fd";
if (getrlimit(RLIMIT_NOFILE, &rlim) < 0) { struct dirent *dirent;
fprintf(stderr, "getrlimit(RLIMIT_NOFILE) failed: %s\n", DIR *d;
strerror(errno));
return;
}
if (getenv("LVM_SUPPRESS_FD_WARNINGS")) if (getenv("LVM_SUPPRESS_FD_WARNINGS"))
suppress_warnings = 1; suppress_warnings = 1;
if (!(d = opendir(_fd_dir))) {
if (errno != ENOENT) {
log_sys_error("opendir", _fd_dir);
return 0; /* broken system */
}
/* Path does not exist, use the old way */
if (getrlimit(RLIMIT_NOFILE, &rlim) < 0) {
log_sys_error("getrlimit", "RLIMIT_NOFILE");
return 1;
}
for (fd = 3; fd < (int)rlim.rlim_cur; fd++) for (fd = 3; fd < (int)rlim.rlim_cur; fd++)
_close_descriptor(fd, suppress_warnings, command, ppid, _close_descriptor(fd, suppress_warnings, command, ppid,
parent_cmdline); parent_cmdline);
return 1;
}
while ((dirent = readdir(d))) {
fd = atoi(dirent->d_name);
if (fd > 2 && fd != dirfd(d))
_close_descriptor(fd, suppress_warnings,
command, ppid, parent_cmdline);
}
if (closedir(d))
log_sys_error("closedir", _fd_dir);
return 1;
} }
struct cmd_context *init_lvm(void) struct cmd_context *init_lvm(void)
@ -1426,7 +1450,8 @@ int lvm2_main(int argc, char **argv)
strcmp(base, "initrd-lvm")) strcmp(base, "initrd-lvm"))
alias = 1; alias = 1;
_close_stray_fds(base); if (!_close_stray_fds(base))
return -1;
if (is_static() && strcmp(base, "lvm.static") && if (is_static() && strcmp(base, "lvm.static") &&
path_exists(LVM_SHARED_PATH) && path_exists(LVM_SHARED_PATH) &&