shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-10-26 08:55:06 +03:00
Code Releases Activity

Merge branch 'fix-suppress-warnings' into 'main'

Browse Source 
libdaemon: fix suppressing stray fd warnings

Closes #20

See merge request lvmteam/lvm2!17
This commit is contained in:
Jack Wilsdon 2024-10-26 00:06:15 +00:00
commit c7cc527610
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libdaemon/server/daemon-stray.h
View File

@ -104,16 +104,15 @@ static void _daemon_close_descriptor(int fd, unsigned suppress_warnings,
* Note: when 'from_fd' is set to -1, unused 'custom_fds' must use same value!
*
* command: print command name with warning message
* suppress_warning: whether to print warning messages
* suppress_warnings: whether to print warning messages
* above_fd: close all descriptors above this descriptor
* custom_fds: preserve descriptors from this set of descriptors
*/
static int daemon_close_stray_fds(const char *command, int suppress_warning,
static int daemon_close_stray_fds(const char *command, int suppress_warnings,
int from_fd, const struct custom_fds *custom_fds)
{
struct rlimit rlim;
int fd;
unsigned suppress_warnings = 0;
pid_t ppid = getppid();
char parent_cmdline[64];
static const char _fd_dir[] = DEFAULT_PROC_DIR "/self/fd";